Mixin tidying