Refactors scraping