Small refactoring and network utils stub