Changes in NetworkCloude and ClientNode
Clean up our code