Refactoring for Multiplicity :cat: