Refactor jump command