Clean up mixin and add proper attribution