Sass cleanup on step 1 styles