cleaned up FileSearcher