diff --git a/les/metrics.go b/les/metrics.go
index b286e2ac6e..797631b8ef 100644
--- a/les/metrics.go
+++ b/les/metrics.go
@@ -64,11 +64,10 @@ var (
 	serverConnectionGauge = metrics.NewRegisteredGauge("les/connection/server", nil)
 	clientConnectionGauge = metrics.NewRegisteredGauge("les/connection/client", nil)
 
-	totalConnectedCapGauge = metrics.NewRegisteredGauge("les/server/connectedCapacity", nil)
-	totalCapacityGauge     = metrics.NewRegisteredGauge("les/server/totalCapacity", nil)
-	totalRechargeGauge     = metrics.NewRegisteredGauge("les/server/totalRecharge", nil)
-	totalConnectedGauge    = metrics.NewRegisteredGauge("les/server/totalConnected", nil)
-	blockProcessingTimer   = metrics.NewRegisteredTimer("les/server/blockProcessingTime", nil)
+	totalCapacityGauge   = metrics.NewRegisteredGauge("les/server/totalCapacity", nil)
+	totalRechargeGauge   = metrics.NewRegisteredGauge("les/server/totalRecharge", nil)
+	totalConnectedGauge  = metrics.NewRegisteredGauge("les/server/totalConnected", nil)
+	blockProcessingTimer = metrics.NewRegisteredTimer("les/server/blockProcessingTime", nil)
 
 	requestServedMeter    = metrics.NewRegisteredMeter("les/server/req/avgServedTime", nil)
 	requestServedTimer    = metrics.NewRegisteredTimer("les/server/req/servedTime", nil)
diff --git a/les/test_helper.go b/les/test_helper.go
index 71f61dd5d4..2efaa769f8 100644
--- a/les/test_helper.go
+++ b/les/test_helper.go
@@ -438,8 +438,7 @@ func newServerEnv(t *testing.T, blocks int, protocol int, callback indexerCallba
 	db := rawdb.NewMemoryDatabase()
 	indexers := testIndexers(db, nil, light.TestServerIndexerConfig)
 
-	var clock mclock.Clock
-	clock = &mclock.System{}
+	var clock mclock.Clock = &mclock.System{}
 	if simClock {
 		clock = &mclock.Simulated{}
 	}
@@ -483,8 +482,7 @@ func newClientServerEnv(t *testing.T, blocks int, protocol int, callback indexer
 	sdb, cdb := rawdb.NewMemoryDatabase(), rawdb.NewMemoryDatabase()
 	speers, cPeers := newPeerSet(), newPeerSet()
 
-	var clock mclock.Clock
-	clock = &mclock.System{}
+	var clock mclock.Clock = &mclock.System{}
 	if simClock {
 		clock = &mclock.Simulated{}
 	}