scraper refactoring updates