Minor refactor to create a Product interface