Some style refactoring.