reorganization to speed up scraper