Refactor scrape