Refactor for style