Scraper refactored