Refactor code into Crawl class & add data validation + filtering