minor mixin refactoring