Code-style refactoring.