Cleaned up the scraper and renamed it