completed sass refactor