diff --git a/aws/retry/middleware.go b/aws/retry/middleware.go
index c32d16f43a5..b645fbdf132 100644
--- a/aws/retry/middleware.go
+++ b/aws/retry/middleware.go
@@ -4,12 +4,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/aws/aws-sdk-go-v2/aws/middleware/private/metrics"
-	internalcontext "github.com/aws/aws-sdk-go-v2/internal/context"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/aws/aws-sdk-go-v2/aws/middleware/private/metrics"
+	internalcontext "github.com/aws/aws-sdk-go-v2/internal/context"
+
 	"github.com/aws/aws-sdk-go-v2/aws"
 	awsmiddle "github.com/aws/aws-sdk-go-v2/aws/middleware"
 	"github.com/aws/aws-sdk-go-v2/internal/sdk"
diff --git a/aws/retry/middleware_test.go b/aws/retry/middleware_test.go
index a8e320e97ca..ad9e4c6a5f7 100644
--- a/aws/retry/middleware_test.go
+++ b/aws/retry/middleware_test.go
@@ -4,8 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/aws/aws-sdk-go-v2/aws/middleware/private/metrics/testutils"
-	internalcontext "github.com/aws/aws-sdk-go-v2/internal/context"
 	"net/http"
 	"reflect"
 	"strconv"
@@ -13,6 +11,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/aws/aws-sdk-go-v2/aws/middleware/private/metrics/testutils"
+	internalcontext "github.com/aws/aws-sdk-go-v2/internal/context"
+
 	"github.com/aws/aws-sdk-go-v2/aws/ratelimit"
 	"github.com/aws/aws-sdk-go-v2/internal/sdk"
 	"github.com/aws/smithy-go/middleware"
diff --git a/aws/retry/retryable_error.go b/aws/retry/retryable_error.go
index 3a7c5fb9711..acd8d1cc3d6 100644
--- a/aws/retry/retryable_error.go
+++ b/aws/retry/retryable_error.go
@@ -3,10 +3,11 @@ package retry
 import (
 	"errors"
 	"fmt"
-	"github.com/aws/aws-sdk-go-v2/aws"
 	"net"
 	"net/url"
 	"strings"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
 )
 
 // IsErrorRetryable provides the interface of an implementation to determine if
diff --git a/internal/auth/smithy/v4signer_adapter.go b/internal/auth/smithy/v4signer_adapter.go
index fb08743bf48..24db8e144cb 100644
--- a/internal/auth/smithy/v4signer_adapter.go
+++ b/internal/auth/smithy/v4signer_adapter.go
@@ -3,6 +3,7 @@ package smithy
 import (
 	"context"
 	"fmt"
+
 	v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4"
 	internalcontext "github.com/aws/aws-sdk-go-v2/internal/context"
 	"github.com/aws/aws-sdk-go-v2/internal/sdk"
diff --git a/internal/middleware/middleware_test.go b/internal/middleware/middleware_test.go
index 342abef7bce..6dd092151ae 100644
--- a/internal/middleware/middleware_test.go
+++ b/internal/middleware/middleware_test.go
@@ -3,13 +3,14 @@ package middleware_test
 import (
 	"context"
 	"fmt"
-	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/aws/retry"
 	"net/http"
 	"sync/atomic"
 	"testing"
 	"time"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/aws/retry"
+
 	"github.com/aws/aws-sdk-go-v2/aws/middleware"
 	internalcontext "github.com/aws/aws-sdk-go-v2/internal/context"
 	internalmiddleware "github.com/aws/aws-sdk-go-v2/internal/middleware"
diff --git a/internal/v4a/smithy.go b/internal/v4a/smithy.go
index 454f99dcf11..af4f6abcfa7 100644
--- a/internal/v4a/smithy.go
+++ b/internal/v4a/smithy.go
@@ -3,9 +3,10 @@ package v4a
 import (
 	"context"
 	"fmt"
-	internalcontext "github.com/aws/aws-sdk-go-v2/internal/context"
 	"time"
 
+	internalcontext "github.com/aws/aws-sdk-go-v2/internal/context"
+
 	v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4"
 	"github.com/aws/aws-sdk-go-v2/internal/sdk"
 	"github.com/aws/smithy-go"