find By Example + Some refactorings