Refactored for SASS