Some cosmetics and change of the network system to the SimpleNetworkWrapper