Some scraper refinement