code style refactorings