Some cleaning to Planner class