cleanup includes
cleanup includes in the new node
indentation, rename GoalCB to goalCB and CancelCB to cancelCB