Refactored to Sass