diff --git a/src/DigitalData.Auth.API/Controllers/AuthController.cs b/src/DigitalData.Auth.API/Controllers/AuthController.cs
index 0a2a4de..cff58d0 100644
--- a/src/DigitalData.Auth.API/Controllers/AuthController.cs
+++ b/src/DigitalData.Auth.API/Controllers/AuthController.cs
@@ -54,15 +54,10 @@ namespace DigitalData.Auth.API.Controllers
 
             //find the user
             var uRes = await _userService.ReadByUsernameAsync(login.Username);
-            if (!uRes.IsSuccess || uRes.Data is null)
-            {
-                return Unauthorized();
-            }
-
-            if (!_apiParams.Consumers.TryGetByRoute(consumerRoute, out var consumer))
+            if (uRes.IsFailed || !_apiParams.Consumers.TryGetByRoute(consumerRoute, out var consumer))
                 return Unauthorized();
 
-            if (!_cryptoFactory.TokenDescriptors.TryGet(_apiParams.Issuer, consumer.Audience, out var descriptor) || descriptor is null)
+            if (!_cryptoFactory.TokenDescriptors.TryGet(_apiParams.Issuer, consumer.Audience, out var descriptor))
                 return StatusCode(StatusCodes.Status500InternalServerError);
 
             var token = _userSignatureHandler.WriteToken(uRes.Data, descriptor);
@@ -84,10 +79,10 @@ namespace DigitalData.Auth.API.Controllers
             if (api is null || api.Password != login.Password)
                 return Unauthorized();
     
-            if (!_cryptoFactory.TokenDescriptors.TryGet(_apiParams.Issuer, _apiParams.DefaultConsumer.Audience, out var descriptor) || descriptor is null)
+            if (!_cryptoFactory.TokenDescriptors.TryGet(_apiParams.Issuer, _apiParams.DefaultConsumer.Audience, out var descriptor))
                 return StatusCode(StatusCodes.Status500InternalServerError);
 
-            var token = _apiSignatureHandler!.WriteToken(api, descriptor);
+            var token = _apiSignatureHandler.WriteToken(api, descriptor);
 
             //set cookie
             if (cookie)
@@ -159,7 +154,7 @@ namespace DigitalData.Auth.API.Controllers
             }
         }
 
-        [HttpPost()]
+        [HttpPost]
         public async Task<IActionResult> CreateTokenViaBody([FromBody] ConsumerApiLogin login, [FromQuery] bool cookie = false)
         {
             try