refactor scraping suite