Slight restructuring of struct peer.