Refactoring DietPlan and Goal.