Styles refactor --continue