Refactor jumps