refactor ScrapeService