Coding standards & refactoring, run 2