refactoring of some SASS