refactor URL finder