Sass Clean-up