data fetcher tool refactoring.