[IMP] product: Improving code