Some small clean ups