Refactor to use Sass