Additional style refactoring