Decrease complexity of progress scraping