Coding style and refactored code