Misc style cleanup