Refactoring Dish a little bit