Refactor the domcrawler