Small refactoring in the network operations