Refactored SCSS