diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
index 653e6c4c..8da7ee87 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
@@ -7,84 +7,74 @@ using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.GeneratorAPI.Controllers
+namespace EnvelopeGenerator.GeneratorAPI.Controllers;
+
+/// <summary>
+/// Controller für die Verwaltung von Empfängern.
+/// </summary>
+/// <remarks>
+/// Dieser Controller bietet Endpunkte für CRUD-Operationen (Erstellen, Lesen, Aktualisieren, Löschen) 
+/// sowie zusätzliche Funktionen wie das Abrufen von Empfängern basierend auf E-Mail-Adresse oder Signatur.
+/// </remarks>
+[Route("api/[controller]")]
+[ApiController]
+[Authorize]
+public class ReceiverController : CRUDControllerBaseWithErrorHandling<IReceiverService, ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>
 {
-    [Route("api/[controller]")]
-    [ApiController]
-    [Authorize]
-    public class ReceiverController : CRUDControllerBaseWithErrorHandling<IReceiverService, ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>
+    /// <summary>
+    /// Initialisiert eine neue Instanz des <see cref="ReceiverController"/>-Controllers.
+    /// </summary>
+    /// <param name="logger">Der Logger für die Protokollierung.</param>
+    /// <param name="service">Der Dienst für Empfängeroperationen.</param>
+    public ReceiverController(ILogger<ReceiverController> logger, IReceiverService service) : base(logger, service)
     {
-        public ReceiverController(ILogger<ReceiverController> logger, IReceiverService service) : base(logger, service)
-        {
-        }
-
-        [HttpGet]
-        public async Task<IActionResult> Get([FromQuery] ReadReceiverQuery receiver)
-        {
-            if (receiver.EmailAddress is null && receiver.Signature is null)
-                return await base.GetAll();
-
-            try
-            {
-                return await _service.ReadByAsync(emailAddress: receiver.EmailAddress, signature: receiver.Signature).ThenAsync(
-                        Success: Ok,
-                        Fail: IActionResult (msg, ntc) =>
-                        {
-                            _logger.LogNotice(ntc);
-                            return StatusCode(StatusCodes.Status500InternalServerError);
-                        });
-            }
-            catch(Exception ex)
-            {
-                _logger.LogError(ex, "{Message}", ex.Message);
-                return StatusCode(StatusCodes.Status500InternalServerError);
-            }
-        }
-
-        [HttpPost]
-        public async override Task<IActionResult> Create(ReceiverCreateDto createDto)
-        {
-            if (!ModelState.IsValid)
-                return BadRequest(ModelState);
-
-            return await base.Create(createDto);
-        }
-
-        [HttpDelete]
-        public async Task<IActionResult> Delete([FromQuery] ReadReceiverQuery receiver)
-        {
-            if(receiver.Id is int id_int)
-                return await base.Delete(id_int);
-
-            try
-            {
-                if (receiver.EmailAddress is not null || receiver.Signature is not null)
-                    return await _service.DeleteByAsync(emailAddress: receiver.EmailAddress, signature: receiver.Signature).ThenAsync(
-                        Success: Ok,
-                        Fail: IActionResult (msg, ntc) =>
-                        {
-                            _logger.LogNotice(ntc);
-                            return StatusCode(StatusCodes.Status500InternalServerError);
-                        });
-            }
-            catch(Exception ex)
-            {
-                _logger.LogError(ex, "{Message}", ex.Message);
-                return StatusCode(500);
-            }
-
-            return BadRequest();
-        }
-
-        #region REMOVED ENDPOINTS
-        [NonAction]
-        public override Task<IActionResult> GetAll() => base.GetAll();
-
-        [NonAction]
-        public override Task<IActionResult> Delete([FromRoute] int id) => base.Delete(id);
-
-        [NonAction]
-        public override Task<IActionResult> Update(ReceiverUpdateDto updateDto) => base.Update(updateDto);
-        #endregion
     }
-}
\ No newline at end of file
+
+    /// <summary>
+    /// Ruft eine Liste von Empfängern ab, basierend auf den angegebenen Abfrageparametern.
+    /// </summary>
+    /// <param name="receiver">Die Abfrageparameter, einschließlich E-Mail-Adresse und Signatur.</param>
+    /// <returns>Eine Liste von Empfängern oder ein Fehlerstatus.</returns>
+    [HttpGet]
+    public async Task<IActionResult> Get([FromQuery] ReadReceiverQuery receiver)
+    {
+        if (receiver.EmailAddress is null && receiver.Signature is null)
+            return await base.GetAll();
+
+        try
+        {
+            return await _service.ReadByAsync(emailAddress: receiver.EmailAddress, signature: receiver.Signature).ThenAsync(
+                    Success: Ok,
+                    Fail: IActionResult (msg, ntc) =>
+                    {
+                        _logger.LogNotice(ntc);
+                        return StatusCode(StatusCodes.Status500InternalServerError);
+                    });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "{Message}", ex.Message);
+            return StatusCode(StatusCodes.Status500InternalServerError);
+        }
+    }
+
+    #region REMOVED ENDPOINTS
+    /// <summary>
+    /// Diese Methode ist deaktiviert und wird nicht verwendet.
+    /// </summary>
+    [NonAction]
+    public override Task<IActionResult> GetAll() => base.GetAll();
+
+    /// <summary>
+    /// Diese Methode ist deaktiviert und wird nicht verwendet.
+    /// </summary>
+    [NonAction]
+    public override Task<IActionResult> Delete([FromRoute] int id) => base.Delete(id);
+
+    /// <summary>
+    /// Diese Methode ist deaktiviert und wird nicht verwendet.
+    /// </summary>
+    [NonAction]
+    public override Task<IActionResult> Update(ReceiverUpdateDto updateDto) => base.Update(updateDto);
+    #endregion
+}