More Sass cleanup