refactor sweep scraper