CSS Refactoring and Cleanup. Vidit