MoveIterator clean up

Clean up, merged functions