12: Simplify Peer initialization

Change-Id: Ia8dd1403d8bf5a034cb5100a6ccbbbf631aab080