Some small clean up.