Refactoring the crawling module parsing