Tidying up Sass code