Small style refactoring