diff --git a/auth/providers/azure/pop_tokenverifier.go b/auth/providers/azure/pop_tokenverifier.go
index b7927ed9..7dd5bee6 100644
--- a/auth/providers/azure/pop_tokenverifier.go
+++ b/auth/providers/azure/pop_tokenverifier.go
@@ -29,8 +29,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
 	cache "go.kubeguard.dev/guard/util/data"
+
+	"github.com/pkg/errors"
 	"gopkg.in/square/go-jose.v2/jwt"
 	"k8s.io/klog/v2"
 )
@@ -86,7 +87,6 @@ func NewPoPVerifier(hostName string, popTokenValidityDuration, cacheRetentionBuf
 		},
 	})
 	if err != nil {
-
 		return nil, err
 	}
 	return &PoPTokenVerifier{
diff --git a/auth/providers/azure/pop_tokenverifier_test_utils.go b/auth/providers/azure/pop_tokenverifier_test_utils.go
index 5d035698..6ad5d4ee 100644
--- a/auth/providers/azure/pop_tokenverifier_test_utils.go
+++ b/auth/providers/azure/pop_tokenverifier_test_utils.go
@@ -251,7 +251,7 @@ func (b *PoPTokenBuilderImpl) SetPayload() error {
 
 	at, err := b.swkKey.GenerateToken([]byte(accessTokenData))
 	if err != nil {
-		return fmt.Errorf("Error when generating token. Error:%+v", err)
+		return fmt.Errorf("error when generating token. Error:%+v", err)
 	}
 
 	payload := fmt.Sprintf(`{ "at" : "%s", "ts" : %d, "u": "%s", "cnf":{"jwk":%s}, "nonce":"%s"}`, at, b.ts, b.hostName, b.popKey.Jwk(), b.nonce)
@@ -310,7 +310,7 @@ func (b *PoPTokenBuilderImpl) SetSignature() error {
 	h256 := sha256.Sum256([]byte(b.token.Header + "." + b.token.Payload))
 	signature, err := b.popKey.Sign(h256[:])
 	if err != nil {
-		return fmt.Errorf("Error while signing pop key. Error:%+v", err)
+		return fmt.Errorf("error while signing pop key. Error:%+v", err)
 	}
 	b.token.Signature = base64.RawURLEncoding.EncodeToString(signature)
 	return nil
@@ -321,11 +321,11 @@ func (b *PoPTokenBuilderImpl) GetToken() (string, error) {
 	var err error
 	b.popKey, err = NewSWPoPKey()
 	if err != nil {
-		return "", fmt.Errorf("Failed to generate Pop key. Error:%+v", err)
+		return "", fmt.Errorf("failed to generate Pop key. Error:%+v", err)
 	}
 	b.swkKey, err = NewSwkKey()
 	if err != nil {
-		return "", fmt.Errorf("Failed to generate SF key. Error:%+v", err)
+		return "", fmt.Errorf("failed to generate SF key. Error:%+v", err)
 	}
 
 	if strings.Contains(b.kid, BadTokenKey) {
diff --git a/authz/types.go b/authz/types.go
index bad9b5f7..6f1f1b0e 100644
--- a/authz/types.go
+++ b/authz/types.go
@@ -22,6 +22,7 @@ import (
 	"strings"
 
 	"go.kubeguard.dev/guard/util/data"
+
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 	authzv1 "k8s.io/api/authorization/v1"