Refactor scraper