diff --git a/EnvelopeGenerator.Web/Controllers/DocumentController.cs b/EnvelopeGenerator.Web/Controllers/DocumentController.cs
index a0621ac2..142b700d 100644
--- a/EnvelopeGenerator.Web/Controllers/DocumentController.cs
+++ b/EnvelopeGenerator.Web/Controllers/DocumentController.cs
@@ -2,14 +2,10 @@
 using EnvelopeGenerator.CommonServices;
 using EnvelopeGenerator.Web.Services;
 using Microsoft.AspNetCore.Authorization;
-using EnvelopeGenerator.Application.Extensions;
-using EnvelopeGenerator.Application.Interfaces.Services;
-using static EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Web.Controllers;
 
-[Authorize(Roles = ReceiverRole.FullyAuth)]
+[Authorize(Roles = Domain.Constants.ReceiverRole.FullyAuth)]
 [Route("api/[controller]")]
 public class DocumentController : BaseController
 {
diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
index 6f0ade63..da8b8857 100644
--- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc;
 using System.Text.Encodings.Web;
 using EnvelopeGenerator.Application.Extensions;
 using EnvelopeGenerator.Application.Interfaces.Services;
-using static EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Web.Extensions;
diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs
index 3d5b51b9..c3c9527d 100644
--- a/EnvelopeGenerator.Web/Controllers/HomeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs
@@ -9,18 +9,16 @@ using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Application.Extensions;
 using EnvelopeGenerator.Web.Extensions;
 using EnvelopeGenerator.Web.Models;
-using Ganss.Xss;
 using MediatR;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Localization;
 using Newtonsoft.Json;
 using OtpNet;
 using System.Security.Claims;
-using static EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Web.Controllers;
 
diff --git a/EnvelopeGenerator.Web/Controllers/ReadOnlyController.cs b/EnvelopeGenerator.Web/Controllers/ReadOnlyController.cs
index ccd17b3a..24a42bfa 100644
--- a/EnvelopeGenerator.Web/Controllers/ReadOnlyController.cs
+++ b/EnvelopeGenerator.Web/Controllers/ReadOnlyController.cs
@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
-using static EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Web.Extensions;
 
 namespace EnvelopeGenerator.Web.Controllers
diff --git a/EnvelopeGenerator.Web/Controllers/TFARegController.cs b/EnvelopeGenerator.Web/Controllers/TFARegController.cs
index 9225acf9..e92b8372 100644
--- a/EnvelopeGenerator.Web/Controllers/TFARegController.cs
+++ b/EnvelopeGenerator.Web/Controllers/TFARegController.cs
@@ -4,14 +4,13 @@ using Microsoft.AspNetCore.Mvc;
 using EnvelopeGenerator.Application.Extensions;
 using Microsoft.Extensions.Localization;
 using EnvelopeGenerator.Application.Resources;
-using EnvelopeGenerator.Application.Extensions;
 using Microsoft.Extensions.Options;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication;
 using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
-using static EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Web.Extensions;
 
 namespace EnvelopeGenerator.Web.Controllers;
diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs
index 4174796f..b9cf9bd6 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestEmailTemplateController.cs
@@ -3,7 +3,7 @@ using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Dto;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
-using static EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs
index b3d0f1fc..498879cd 100644
--- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs
+++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeHistoryController.cs
@@ -3,7 +3,7 @@ using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Dto.EnvelopeHistory;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;
-using static EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Web.Controllers.Test;
 
diff --git a/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml b/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml
index 31414971..ecaf2396 100644
--- a/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml
+++ b/EnvelopeGenerator.Web/Views/TestView/DebugEnvelopes.cshtml
@@ -1,6 +1,6 @@
 @using EnvelopeGenerator.CommonServices;
 @using EnvelopeGenerator.Domain.Entities;
-@using static EnvelopeGenerator.Domain.Constants;
+@using EnvelopeGenerator.Domain.Constants;
 @{
     ViewData["Title"] = "Debug";
 }
@@ -8,8 +8,8 @@
 @functions {
     string encodeEnvelopeKey(Envelope envelope)
     {
-        var receiver = envelope.Receivers.First();
-        return Helpers.EncodeEnvelopeReceiverId(envelope.Uuid, receiver.Receiver.Signature);
+        var receiver = envelope.Receivers!.First();
+        return Helpers.EncodeEnvelopeReceiverId(envelope.Uuid, receiver.Receiver!.Signature);
     }
 
     IEnumerable<IGrouping<EnvelopeStatus, Envelope>> groupEnvelopes(List<Envelope> envelopes)