Misc style improvements
misc style improvements