Reorder and cleanup .sass