[Finder] refactored scanner & added docblock