SCSS tidy-up