Misc style improvements