Some small clean up