Tidying up Sass files