Refactored and cleaned the css