Fix bug in multiple jump detection
Refactor move method into two methods