Misc. Sass refactoring/optimisation