diff --git a/management/server/personal_access_token.go b/management/server/personal_access_token.go
index c00aa8de3..288489311 100644
--- a/management/server/personal_access_token.go
+++ b/management/server/personal_access_token.go
@@ -32,7 +32,7 @@ func CreateNewPAT(description string, expirationInDays int, createdBy string) (*
 		ExpirationDate: currentTime.AddDate(0, 0, expirationInDays),
 		CreatedBy:      createdBy,
 		CreatedAt:      currentTime,
-		LastUsed:       currentTime, // using creation time as nil not possible
+		LastUsed:       currentTime,
 	}, plainToken
 }
 
diff --git a/management/server/personal_access_token_test.go b/management/server/personal_access_token_test.go
index e1e4cb520..59d5fc116 100644
--- a/management/server/personal_access_token_test.go
+++ b/management/server/personal_access_token_test.go
@@ -18,8 +18,8 @@ func TestPAT_GenerateToken_Hashing(t *testing.T) {
 
 func TestPAT_GenerateToken_Prefix(t *testing.T) {
 	_, plainToken := generateNewToken()
-	fourLetterPrefix := plainToken[:4]
-	assert.Equal(t, "nbp_", fourLetterPrefix)
+	fourCharPrefix := plainToken[:4]
+	assert.Equal(t, "nbp_", fourCharPrefix)
 }
 
 func TestPAT_GenerateToken_Checksum(t *testing.T) {
@@ -28,10 +28,10 @@ func TestPAT_GenerateToken_Checksum(t *testing.T) {
 	if len(tokenWithoutPrefix) != 36 {
 		t.Fatal("Token has wrong length")
 	}
-	token := tokenWithoutPrefix[:len(tokenWithoutPrefix)-6]
+	secret := tokenWithoutPrefix[:len(tokenWithoutPrefix)-6]
 	tokenCheckSum := tokenWithoutPrefix[len(tokenWithoutPrefix)-6:]
 
-	expectedChecksum := crc32.ChecksumIEEE([]byte(token))
+	expectedChecksum := crc32.ChecksumIEEE([]byte(secret))
 	actualChecksum, err := base62.Decode(tokenCheckSum)
 	if err != nil {
 		t.Fatal(err)