Cleaned up the mixin method