styles refactor