Cleaned up scraper