Refactoring of Products

:tea: