refactored webscraper