Simplify moveTo() logic

A refactoring of moveTo() to avoid extra checks of todoOk