cleanup and formatting changes
concurrency bug in updateExistingPeerAddress. The map was not
synchronized and the put was not all the time correct