Ingredient class and Cleanup Logic Segregation