mq-vals mixin, refactor