refactored to sass