Finished DRYing of Scraper