move mixin and remove unnecessary comment