step 2.1 - CSS refactor