Refactor to use a scraper class