cleaned up scraper