Coding standards & refactoring - run 3