Small style refactorings