CSS refactoring