Changed Sass to SCSS, cleaned up code