Refactoring jump functions