Start refactoring for SCSS