Tidied up in p2pNetwork module