diff --git a/compiler/protogen/protogen_test.go b/compiler/protogen/protogen_test.go
index c3982c5e..6f08b2e3 100644
--- a/compiler/protogen/protogen_test.go
+++ b/compiler/protogen/protogen_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
diff --git a/encoding/protojson/encode_test.go b/encoding/protojson/encode_test.go
index d0a343e1..df2fbc95 100644
--- a/encoding/protojson/encode_test.go
+++ b/encoding/protojson/encode_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/internal/detrand"
 	"google.golang.org/protobuf/internal/encoding/pack"
diff --git a/encoding/prototext/encode_test.go b/encoding/prototext/encode_test.go
index db113bce..8b821e10 100644
--- a/encoding/prototext/encode_test.go
+++ b/encoding/prototext/encode_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	"google.golang.org/protobuf/encoding/prototext"
 	"google.golang.org/protobuf/internal/detrand"
 	"google.golang.org/protobuf/internal/encoding/pack"
diff --git a/internal/encoding/json/decode_number.go b/internal/encoding/json/decode_number.go
index a6956892..2999d713 100644
--- a/internal/encoding/json/decode_number.go
+++ b/internal/encoding/json/decode_number.go
@@ -221,7 +221,6 @@ func normalizeToIntString(n numberParts) (string, bool) {
 		for i := 0; i < exp-fracSize; i++ {
 			num = append(num, '0')
 		}
-
 	} else {
 		// For negative E, shift digits in integer part out.
 
diff --git a/internal/encoding/json/decode_test.go b/internal/encoding/json/decode_test.go
index b788c39f..d70c3de0 100644
--- a/internal/encoding/json/decode_test.go
+++ b/internal/encoding/json/decode_test.go
@@ -12,6 +12,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/google/go-cmp/cmp"
+
 	"google.golang.org/protobuf/internal/encoding/json"
 )
 
diff --git a/internal/encoding/json/encode_test.go b/internal/encoding/json/encode_test.go
index d6616c71..5370f8b8 100644
--- a/internal/encoding/json/encode_test.go
+++ b/internal/encoding/json/encode_test.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+
 	"google.golang.org/protobuf/internal/detrand"
 	"google.golang.org/protobuf/internal/encoding/json"
 )
diff --git a/internal/encoding/pack/pack_test.go b/internal/encoding/pack/pack_test.go
index 2e76b514..8a3d0697 100644
--- a/internal/encoding/pack/pack_test.go
+++ b/internal/encoding/pack/pack_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	"google.golang.org/protobuf/encoding/prototext"
 	pdesc "google.golang.org/protobuf/reflect/protodesc"
 	pref "google.golang.org/protobuf/reflect/protoreflect"
diff --git a/internal/encoding/text/decode_test.go b/internal/encoding/text/decode_test.go
index 4749f8c5..3f8047f2 100644
--- a/internal/encoding/text/decode_test.go
+++ b/internal/encoding/text/decode_test.go
@@ -12,6 +12,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/google/go-cmp/cmp"
+
 	"google.golang.org/protobuf/internal/encoding/text"
 	"google.golang.org/protobuf/internal/flags"
 )
diff --git a/internal/encoding/text/encode_test.go b/internal/encoding/text/encode_test.go
index b9ad92a1..2588b1b0 100644
--- a/internal/encoding/text/encode_test.go
+++ b/internal/encoding/text/encode_test.go
@@ -11,6 +11,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/google/go-cmp/cmp"
+
 	"google.golang.org/protobuf/internal/detrand"
 	"google.golang.org/protobuf/internal/encoding/text"
 )
diff --git a/internal/filedesc/desc_test.go b/internal/filedesc/desc_test.go
index 08930a2b..57a693cb 100644
--- a/internal/filedesc/desc_test.go
+++ b/internal/filedesc/desc_test.go
@@ -13,6 +13,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	detrand "google.golang.org/protobuf/internal/detrand"
 	"google.golang.org/protobuf/internal/filedesc"
 	"google.golang.org/protobuf/proto"
diff --git a/internal/impl/extension_test.go b/internal/impl/extension_test.go
index 6f83d033..171f3122 100644
--- a/internal/impl/extension_test.go
+++ b/internal/impl/extension_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	"google.golang.org/protobuf/proto"
 	pref "google.golang.org/protobuf/reflect/protoreflect"
 
diff --git a/internal/impl/legacy_aberrant_test.go b/internal/impl/legacy_aberrant_test.go
index 9786207d..c51b0c7e 100644
--- a/internal/impl/legacy_aberrant_test.go
+++ b/internal/impl/legacy_aberrant_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	"google.golang.org/protobuf/encoding/prototext"
 	"google.golang.org/protobuf/internal/impl"
 	"google.golang.org/protobuf/reflect/protodesc"
diff --git a/internal/impl/legacy_file_test.go b/internal/impl/legacy_file_test.go
index bc186487..e59f0a03 100644
--- a/internal/impl/legacy_file_test.go
+++ b/internal/impl/legacy_file_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	"google.golang.org/protobuf/internal/impl"
 	"google.golang.org/protobuf/internal/pragma"
 	"google.golang.org/protobuf/proto"
diff --git a/internal/impl/legacy_test.go b/internal/impl/legacy_test.go
index 16bbafd7..f699568c 100644
--- a/internal/impl/legacy_test.go
+++ b/internal/impl/legacy_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+
 	"google.golang.org/protobuf/encoding/prototext"
 	pimpl "google.golang.org/protobuf/internal/impl"
 	"google.golang.org/protobuf/internal/pragma"
diff --git a/internal/impl/message_reflect_test.go b/internal/impl/message_reflect_test.go
index 26c271dd..66c25361 100644
--- a/internal/impl/message_reflect_test.go
+++ b/internal/impl/message_reflect_test.go
@@ -15,6 +15,7 @@ import (
 
 	cmp "github.com/google/go-cmp/cmp"
 	cmpopts "github.com/google/go-cmp/cmp/cmpopts"
+
 	"google.golang.org/protobuf/encoding/prototext"
 	pimpl "google.golang.org/protobuf/internal/impl"
 	"google.golang.org/protobuf/proto"
diff --git a/internal/protobuild/build.go b/internal/protobuild/build.go
index 8790d5f1..cb2f4a5a 100644
--- a/internal/protobuild/build.go
+++ b/internal/protobuild/build.go
@@ -98,7 +98,6 @@ func (template Message) Build(m pref.Message) {
 				v.(Message).Build(m.Mutable(fd).Message())
 			}
 		}
-
 	}
 }
 
diff --git a/proto/encode_test.go b/proto/encode_test.go
index edef1395..80e8f5da 100644
--- a/proto/encode_test.go
+++ b/proto/encode_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	"google.golang.org/protobuf/encoding/prototext"
 	"google.golang.org/protobuf/internal/encoding/wire"
 	"google.golang.org/protobuf/proto"
diff --git a/proto/extension_test.go b/proto/extension_test.go
index b434206e..0c58cc32 100644
--- a/proto/extension_test.go
+++ b/proto/extension_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	"google.golang.org/protobuf/proto"
 	pref "google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/runtime/protoimpl"
@@ -64,7 +65,6 @@ func TestExtensionFuncs(t *testing.T) {
 		if proto.HasExtension(test.message, test.ext) {
 			t.Errorf("%v:\nafter clearing extension HasExtension(...) = true, want false", desc)
 		}
-
 	}
 }
 
diff --git a/proto/merge_test.go b/proto/merge_test.go
index 48d8a41d..2f2b4ba0 100644
--- a/proto/merge_test.go
+++ b/proto/merge_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+
 	"google.golang.org/protobuf/encoding/prototext"
 	"google.golang.org/protobuf/internal/encoding/pack"
 	"google.golang.org/protobuf/internal/protobuild"
@@ -645,7 +646,6 @@ func TestMerge(t *testing.T) {
 				if !proto.Equal(dst, want) {
 					t.Fatalf("mutation observed after modifying source:\n got %v\nwant %v\ndiff (-want,+got):\n%v", dst, want, cmp.Diff(want, dst, protocmp.Transform()))
 				}
-
 			})
 		}
 	}
diff --git a/testing/protocmp/util_test.go b/testing/protocmp/util_test.go
index 9b40e669..12065920 100644
--- a/testing/protocmp/util_test.go
+++ b/testing/protocmp/util_test.go
@@ -10,10 +10,11 @@ import (
 	"github.com/google/go-cmp/cmp"
 
 	"google.golang.org/protobuf/internal/encoding/pack"
-	testpb "google.golang.org/protobuf/internal/testprotos/test"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/types/dynamicpb"
+
+	testpb "google.golang.org/protobuf/internal/testprotos/test"
 )
 
 func TestEqual(t *testing.T) {