new Sass design pattern, and other cleanup