Coding standards refactorings