Refactor peers into separate set
Rename Peer --> PeerSet
Refactor
Refactor some configuration stuff