improve mixins