Change product to batch, cleaning product close #49