Style guideline fixes

A bunch of fixes to comply with style guidelines.