Merges NodeWrapper to contain attributes for ClosePeer
Removes unused stuff related to Random
Fixes formatting