Refactor tool moveTo method