Improved SCSS again