Refactor scraper

Refactor scraper.