Tidied up SCSS