Refactored in Sass