Small code style refactorings