More refactoring because of style guide