PIM-871 : Clean code for products and variant