Coding standards refactoring