refactored sass some more