Clean up and refactor Peer and Peers