refactor vedored mixins