Improved SCSS