clean up, refactored parse-jump code