Minor refactoring of network_basic