Refactor, deleting the factory muffin facade