Refactor scraper, encapsulate data in one data object