diff --git a/keypair.go b/keypair.go
index 283cb92..1ab0649 100644
--- a/keypair.go
+++ b/keypair.go
@@ -14,10 +14,10 @@ import (
  */
 
 type KeyPair struct {
+	sendNonce    uint64
 	send         cipher.AEAD
 	receive      cipher.AEAD
 	replayFilter ReplayFilter
-	sendNonce    uint64
 	isInitiator  bool
 	created      time.Time
 	localIndex   uint32
diff --git a/peer.go b/peer.go
index 5580cf6..3a4f5f2 100644
--- a/peer.go
+++ b/peer.go
@@ -13,9 +13,9 @@ const (
 )
 
 type Peer struct {
+	persistentKeepaliveInterval uint64
 	isRunning                   AtomicBool
 	mutex                       sync.RWMutex
-	persistentKeepaliveInterval uint64
 	keyPairs                    KeyPairs
 	handshake                   Handshake
 	device                      *Device