Refactor for style guidelines