major sass refactor