Refactoring the scraper.