Refactor using SASS