Refactor, convert to Sass