Refactor Producer, Deliverer, Product