JW/Chey's Sass refactor