refactor leap
refactor