Sass code organisation and cleanup