Cleaned up SASS