typos
Finder refactored