Refactor to use SASS