more sass refactoring