Used CodePro to check the styles of all classes again and corrected bad
styles according to our standards.