multiple changes, primarily formatting mixins