Refactored peer communication