SCSS improved