Minor refactor
Replan