Improving scraping lib