Styles refactoring