Clean up, added mixin