Some modifications to make Scraper module cleaner