More improved SCSS