More sass refactoring