Refactoring of FindSimilar