refactored sass