Fix comment and organisation of mixins