Styles refactured