Scraper cleanup and refactoring.