Refactor PeerInfo message