Clean up SASS file layout