Clean up and hooking up SASS