Simplified the mixin.