CSS refactoring and comments