Mixin refactor