Misc style clean up