Refactor, conversion to Sass