Minor style refactoring