Minor mixin refactoring