diff --git a/internal/consensus/mocks/cons_sync_reactor.go b/internal/consensus/mocks/cons_sync_reactor.go
index f904e9129..3aa02e9fe 100644
--- a/internal/consensus/mocks/cons_sync_reactor.go
+++ b/internal/consensus/mocks/cons_sync_reactor.go
@@ -6,6 +6,7 @@ import (
 	testing "testing"
 
 	mock "github.com/stretchr/testify/mock"
+
 	state "github.com/tendermint/tendermint/internal/state"
 )
 
diff --git a/internal/state/indexer/mocks/event_sink.go b/internal/state/indexer/mocks/event_sink.go
index decf551ab..69abe3907 100644
--- a/internal/state/indexer/mocks/event_sink.go
+++ b/internal/state/indexer/mocks/event_sink.go
@@ -6,6 +6,7 @@ import (
 	context "context"
 
 	mock "github.com/stretchr/testify/mock"
+
 	indexer "github.com/tendermint/tendermint/internal/state/indexer"
 
 	query "github.com/tendermint/tendermint/internal/pubsub/query"
diff --git a/internal/state/mocks/evidence_pool.go b/internal/state/mocks/evidence_pool.go
index 49633269b..0ea3ba17b 100644
--- a/internal/state/mocks/evidence_pool.go
+++ b/internal/state/mocks/evidence_pool.go
@@ -6,6 +6,7 @@ import (
 	context "context"
 
 	mock "github.com/stretchr/testify/mock"
+
 	state "github.com/tendermint/tendermint/internal/state"
 
 	testing "testing"
diff --git a/internal/state/mocks/store.go b/internal/state/mocks/store.go
index 9b41f3c1b..1d9ef2f6f 100644
--- a/internal/state/mocks/store.go
+++ b/internal/state/mocks/store.go
@@ -4,6 +4,7 @@ package mocks
 
 import (
 	mock "github.com/stretchr/testify/mock"
+
 	state "github.com/tendermint/tendermint/internal/state"
 	tendermintstate "github.com/tendermint/tendermint/proto/tendermint/state"
 
diff --git a/internal/statesync/mocks/state_provider.go b/internal/statesync/mocks/state_provider.go
index 582ebcd9c..82e4bd60e 100644
--- a/internal/statesync/mocks/state_provider.go
+++ b/internal/statesync/mocks/state_provider.go
@@ -6,6 +6,7 @@ import (
 	context "context"
 
 	mock "github.com/stretchr/testify/mock"
+
 	state "github.com/tendermint/tendermint/internal/state"
 
 	testing "testing"
diff --git a/internal/store/store.go b/internal/store/store.go
index aadc53286..41ba208e6 100644
--- a/internal/store/store.go
+++ b/internal/store/store.go
@@ -618,7 +618,7 @@ const (
 	prefixBlockCommit = int64(2)
 	prefixSeenCommit  = int64(3)
 	prefixBlockHash   = int64(4)
-	prefixExtCommit   = int64(9)  // 5..8 are used by state/store
+	prefixExtCommit   = int64(9) // 5..8 are used by state/store
 )
 
 func blockMetaKey(height int64) []byte {
diff --git a/scripts/confix/confix.go b/scripts/confix/confix.go
index 6677f0b49..b24c3a778 100644
--- a/scripts/confix/confix.go
+++ b/scripts/confix/confix.go
@@ -17,6 +17,7 @@ import (
 	"github.com/creachadair/tomledit"
 	"github.com/creachadair/tomledit/transform"
 	"github.com/spf13/viper"
+
 	"github.com/tendermint/tendermint/config"
 )