Turned duplicates into mixins