Refactored sass