PeerDiscovery - minor cleanup