Cleaned up scraper logic