added modularity to scraper