cleanup, rename, add in product list