Refactor Ingredient Cleanup