Fixed #22, refactor to remove peer.rs