Some small cleanup