Refactor to Product