[IMP] product : Improve the code.