mixin tidyup