CMBMNetwork: some refactoring