jump refactor