Refactor network crawler