CSS refactoring to improve maintainability