CSS cleanup and refactoring