style refactorings