Coding Styles refactoring