SCSS organization and clean up