sass cleanup and refactoring
sass cleanup and refactoring