Working on refactoring to Sass