cleaning up the mixin classes