Simplify the crawling code