Coding style refactoring