diff --git a/controller/config/config.go b/controller/config/config.go
index eace6314509c2d0af78427e3fcaaac08deafe104..c1e87c46ab1ec48b4fa0eca0cf16bcd2e7267492 100644
--- a/controller/config/config.go
+++ b/controller/config/config.go
@@ -83,7 +83,7 @@ var CertFilePath string
 // KeyFilePath si the path to the private key that the controller should use for TLS connections.
 var KeyFilePath string
 
-// MaxTokensPerUser is the maximum number of tokens a user can have. This determiens the maximum of concurrent logged in sessions per user.
+// MaxTokensPerUser is the maximum number of tokens a user can have. This determines the maximum of concurrent logged in sessions per user.
 var MaxTokensPerUser int
 
 // Init gets called on module import.
diff --git a/controller/controller.go b/controller/controller.go
index c88134520755a143e22e1e61c27e316e8719c8aa..65d692517d2a1d5005919b63e9ead1b431b2e9e2 100644
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -173,7 +173,7 @@ func initialize() error {
 		return err
 	}
 
-	if err := deletAllExpiredUserTokens(); err != nil {
+	if err := deleteAllExpiredUserTokens(); err != nil {
 		return err
 	}
 
@@ -446,14 +446,14 @@ func ensureDefaultUserExists() error {
 	return nil
 }
 
-func deletAllExpiredUserTokens() error {
+func deleteAllExpiredUserTokens() error {
 	var usersToUpdate []rbac.User
 	// Temporary create JWT manager just to evaluate tokens here
 	jwtManager := rbacImpl.NewJWTManager(config.JWTSecret, config.JWTDuration)
 
 	users, err := c.userService.GetAll()
 	if err != nil {
-		return fmt.Errorf("error getting all users while deleting expires user tokens: %w", err)
+		return fmt.Errorf("error getting all users while deleting expired user tokens: %w", err)
 	}
 
 	for _, user := range users {
diff --git a/controller/northbound/server/auth.go b/controller/northbound/server/auth.go
index 0fd198a1a4a2ae0eeb6b7d8df3e46d42cdf2ec4f..5ef41402341f632903ba2c17b37a5f40f11c8700 100644
--- a/controller/northbound/server/auth.go
+++ b/controller/northbound/server/auth.go
@@ -159,7 +159,7 @@ func (s AuthServer) isCorrectPassword(storedPassword, salt, loginPassword string
 }
 
 // handleLogout checks if the provided user name matches with the one associated with token and
-// removed the token from all tokens of the user.
+// removes the token from all tokens of the user.
 func (s AuthServer) handleLogout(ctx context.Context, userName string) error {
 	md, ok := metadata.FromIncomingContext(ctx)
 	if !ok {