CSS Refactoring