refactored some scss