style guide refactoring