network refactoring