Net setup mode
Minor refactoring