Styles cleanup and refactoring