Cleaning up, simplifying Sass structure