diff --git a/ipfsconn/ipfshttp/ipfshttp.go b/ipfsconn/ipfshttp/ipfshttp.go
index 21fb2d58..42fca330 100644
--- a/ipfsconn/ipfshttp/ipfshttp.go
+++ b/ipfsconn/ipfshttp/ipfshttp.go
@@ -48,6 +48,10 @@ var logger = logging.Logger("ipfshttp")
 // on-demand requests against the configured IPFS daemom
 // (such as a pin request).
 type Connector struct {
+	updateMetricCount uint64
+
+	ipfsPinCount int64
+
 	ctx    context.Context
 	cancel func()
 
@@ -59,10 +63,6 @@ type Connector struct {
 
 	client *http.Client // client to ipfs daemon
 
-	updateMetricCount uint64
-
-	ipfsPinCount int64
-
 	shutdownLock sync.Mutex
 	shutdown     bool
 	wg           sync.WaitGroup
diff --git a/pintracker/optracker/operationtracker.go b/pintracker/optracker/operationtracker.go
index 136bc96f..68e00a1f 100644
--- a/pintracker/optracker/operationtracker.go
+++ b/pintracker/optracker/operationtracker.go
@@ -27,16 +27,16 @@ var logger = logging.Logger("optracker")
 
 // OperationTracker tracks and manages all inflight Operations.
 type OperationTracker struct {
+	pinningCount   int64
+	pinErrorCount  int64
+	pinQueuedCount int64
+
 	ctx      context.Context // parent context for all ops
 	pid      peer.ID
 	peerName string
 
 	mu         sync.RWMutex
 	operations map[api.Cid]*Operation
-
-	pinningCount   int64
-	pinErrorCount  int64
-	pinQueuedCount int64
 }
 
 func (opt *OperationTracker) String() string {