refactoring Finder