diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeController.cs
index c00db5b5..713f87c2 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Controllers/EnvelopeController.cs
@@ -23,27 +23,16 @@ namespace EnvelopeGenerator.Server.Controllers;
 /// - 404 Not Found: Die angeforderte Ressource wurde nicht gefunden.
 /// - 500 Internal Server Error: Ein unerwarteter Fehler ist aufgetreten.
 /// </remarks>
+/// <remarks>
+/// Erstellt eine neue Instanz des EnvelopeControllers.
+/// </remarks>
+/// <param name="Logger">Der Logger, der für das Protokollieren von Informationen verwendet wird.</param>
+/// <param name="Mediator"></param>
 [Route("api/[controller]")]
 [ApiController]
 [Authorize]
-public class EnvelopeController : ControllerBase
+public class EnvelopeController(ILogger<EnvelopeController> Logger, IMediator Mediator) : ControllerBase
 {
-    public record DeleteEnvelopeRequest(string Reason);
-
-    private readonly ILogger<EnvelopeController> _logger;
-    private readonly IMediator _mediator;
-
-    /// <summary>
-    /// Erstellt eine neue Instanz des EnvelopeControllers.
-    /// </summary>
-    /// <param name="logger">Der Logger, der für das Protokollieren von Informationen verwendet wird.</param>
-    /// <param name="mediator"></param>
-    public EnvelopeController(ILogger<EnvelopeController> logger, IMediator mediator)
-    {
-        _logger = logger;
-        _mediator = mediator;
-    }
-
     /// <summary>
     /// Ruft eine Liste von Umschlägen basierend auf dem Benutzer und den angegebenen Statusfiltern ab.
     /// </summary>
@@ -58,8 +47,8 @@ public class EnvelopeController : ControllerBase
     [HttpGet]
     public async Task<IActionResult> GetAsync([FromQuery] ReadEnvelopeQuery envelope)
     {
-        var result = await _mediator.Send(envelope.Authorize(User.GetId()));
-        return result.Any() ? Ok(result) : NotFound();
+        var result = await Mediator.Send(envelope.Authorize(User.GetId()));
+        return Ok(result ?? []);
     }
 
     /// <summary>
@@ -74,7 +63,7 @@ public class EnvelopeController : ControllerBase
     [HttpGet("doc-result")]
     public async Task<IActionResult> GetDocResultAsync([FromQuery] ReadEnvelopeQuery query, [FromQuery] bool view = false)
     {
-        var envelopes = await _mediator.Send(query.Authorize(User.GetId()));
+        var envelopes = await Mediator.Send(query.Authorize(User.GetId()));
         var envelope = envelopes.FirstOrDefault();
 
         if (envelope is null)
@@ -100,22 +89,34 @@ public class EnvelopeController : ControllerBase
     [HttpPost]
     public async Task<IActionResult> CreateAsync([FromBody] CreateEnvelopeCommand command)
     {
-        var res = await _mediator.Send(command.WithAuth(User.GetId()));
+        var res = await Mediator.Send(command.WithAuth(User.GetId()));
 
         if (res is null)
         {
-            _logger.LogError("Failed to create envelope. Envelope details: {EnvelopeDetails}", JsonConvert.SerializeObject(command));
+            Logger.LogError("Failed to create envelope. Envelope details: {EnvelopeDetails}", JsonConvert.SerializeObject(command));
             return StatusCode(StatusCodes.Status500InternalServerError);
         }
         else
             return Ok(res);
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="Reason"></param>
+    public record DeleteEnvelopeRequest(string Reason);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="request"></param>
+    /// <returns></returns>
     [Authorize(AuthenticationSchemes = AuthScheme.Sender)]
     [HttpDelete("{id:int}")]
     public async Task<IActionResult> DeleteAsync([FromRoute] int id, [FromBody] DeleteEnvelopeRequest request)
     {
-        var result = await _mediator.Send(new DeleteEnvelopeCommand
+        var result = await Mediator.Send(new DeleteEnvelopeCommand
         {
             EnvelopeId = id,
             Reason = request?.Reason ?? string.Empty
@@ -133,7 +134,7 @@ public class EnvelopeController : ControllerBase
     [HttpPost("finalize")]
     public async Task<IActionResult> FinalizeEnvelopeAsync([FromQuery] FinalizeEnvelopeCommand command)
     {
-        await _mediator.Send(command.Authorized(User.GetId()));
+        await Mediator.Send(command.Authorized(User.GetId()));
         return Ok();
     }