Refactor mixin module a bit