Refactor scraper.