Some SCSS refactoring