Code style refactoring