Coding standard and refactoring