Styles refactor