Refactored scraper