SASS Code Cleanup