[CHORE] Tidies up mixins