more refactoring of Identify.
refactoring of Find.