Some refactoring in CSS files