diff --git a/nat/upnp.go b/nat/upnp.go
index aa26d6d82fc6..d1aab02398b3 100644
--- a/nat/upnp.go
+++ b/nat/upnp.go
@@ -161,7 +161,7 @@ func getUPnPClient(client goupnp.ServiceClient) upnpClient {
 	}
 }
 
-// discover() tries to find  gateway device
+// discover() tries to find gateway device
 func discover(target string) *upnpRouter {
 	devs, err := goupnp.DiscoverDevices(target)
 	if err != nil {
diff --git a/vms/avm/fxs/fx.go b/vms/avm/fxs/fx.go
index 2749ee4500a3..7dec9fdfb531 100644
--- a/vms/avm/fxs/fx.go
+++ b/vms/avm/fxs/fx.go
@@ -46,7 +46,7 @@ type Fx interface {
 	// VerifyOperation verifies that the specified transaction can spend the
 	// provided utxos conditioned on the result being restricted to the provided
 	// outputs. If the transaction can't spend the output based on the input and
-	// credential, a non-nil error  should be returned.
+	// credential, a non-nil error should be returned.
 	VerifyOperation(tx, op, cred interface{}, utxos []interface{}) error
 }
 
diff --git a/vms/platformvm/state/state_test.go b/vms/platformvm/state/state_test.go
index 0c17fc31a31f..f4e29ccceda6 100644
--- a/vms/platformvm/state/state_test.go
+++ b/vms/platformvm/state/state_test.go
@@ -317,7 +317,7 @@ func TestPersistStakers(t *testing.T) {
 				r.ErrorIs(err, database.ErrNotFound)
 			},
 			checkDiffs: func(r *require.Assertions, s *state, staker *Staker, height uint64) {
-				// pending validators  weight diff and bls diffs are not stored
+				// pending validators weight diff and bls diffs are not stored
 				_, err := s.flatValidatorWeightDiffsDB.Get(marshalDiffKey(staker.SubnetID, height, staker.NodeID))
 				r.ErrorIs(err, database.ErrNotFound)
 
diff --git a/wallet/chain/p/builder_test.go b/wallet/chain/p/builder_test.go
index 473103147549..c971b0200b02 100644
--- a/wallet/chain/p/builder_test.go
+++ b/wallet/chain/p/builder_test.go
@@ -663,7 +663,7 @@ func makeTestUTXOs(utxosKey *secp256k1.PrivateKey) []*avax.UTXO {
 
 	utxosAddr := utxosKey.Address()
 	return []*avax.UTXO{
-		{ // a small UTXO first, which  should not be enough to pay fees
+		{ // a small UTXO first, which should not be enough to pay fees
 			UTXOID: avax.UTXOID{
 				TxID:        ids.Empty.Prefix(utxosOffset),
 				OutputIndex: uint32(utxosOffset),
diff --git a/wallet/chain/x/builder_test.go b/wallet/chain/x/builder_test.go
index f4eb916b693c..0e349ad28565 100644
--- a/wallet/chain/x/builder_test.go
+++ b/wallet/chain/x/builder_test.go
@@ -461,7 +461,7 @@ func makeTestUTXOs(utxosKey *secp256k1.PrivateKey) []*avax.UTXO {
 	const utxosOffset uint64 = 2024
 
 	return []*avax.UTXO{ // currently, the wallet scans UTXOs in the order provided here
-		{ // a small UTXO first, which  should not be enough to pay fees
+		{ // a small UTXO first, which should not be enough to pay fees
 			UTXOID: avax.UTXOID{
 				TxID:        ids.Empty.Prefix(utxosOffset),
 				OutputIndex: uint32(utxosOffset),