Refactored Dish code