CSS refactorings