diff --git a/pkg/controller/clone_controller_test.go b/pkg/controller/clone_controller_test.go
index aa20b3e4c3..07477e73e1 100644
--- a/pkg/controller/clone_controller_test.go
+++ b/pkg/controller/clone_controller_test.go
@@ -16,7 +16,7 @@ import (
 )
 
 var requestedBytes int64 = 1000
-var fakeSc1 string = "fake-sc-1"
+var fakeSc1 = "fake-sc-1"
 
 const (
 	srcName      = "clone-source-pvc"
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
index 649045b11a..1a36ea7ecf 100644
--- a/pkg/controller/controller.go
+++ b/pkg/controller/controller.go
@@ -25,18 +25,15 @@ import (
 	"strings"
 	"time"
 
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/kubernetes-csi/csi-lib-utils/connection"
 	"github.com/kubernetes-csi/csi-lib-utils/metrics"
 	"github.com/kubernetes-csi/csi-lib-utils/rpc"
 	snapapi "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1beta1"
 	snapclientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"
-	"sigs.k8s.io/sig-storage-lib-external-provisioner/v5/controller"
-	"sigs.k8s.io/sig-storage-lib-external-provisioner/v5/util"
-
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	v1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -45,13 +42,13 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
-	"k8s.io/klog"
-
-	"google.golang.org/grpc"
 	corelisters "k8s.io/client-go/listers/core/v1"
 	storagelistersv1 "k8s.io/client-go/listers/storage/v1"
 	storagelistersv1beta1 "k8s.io/client-go/listers/storage/v1beta1"
+	"k8s.io/client-go/rest"
+	"k8s.io/klog"
+	"sigs.k8s.io/sig-storage-lib-external-provisioner/v5/controller"
+	"sigs.k8s.io/sig-storage-lib-external-provisioner/v5/util"
 )
 
 //secretParamsMap provides a mapping of current as well as deprecated secret keys