refactor prospector client