Cleaning up functions and SCSS to gain consistency