diff --git a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Models/SignatureCaptureDto.cs b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Models/SignatureCaptureDto.cs
index 5c137cac..21977846 100644
--- a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Models/SignatureCaptureDto.cs
+++ b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Models/SignatureCaptureDto.cs
@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.ReceiverUI.Models;
+namespace EnvelopeGenerator.WebUI.Client.Models;
 
 /// <summary>
 /// Represents a captured signature with metadata created by the receiver in the signature popup.
diff --git a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/AnnotationService.cs b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/AnnotationService.cs
index b70e9db2..ab6445ce 100644
--- a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/AnnotationService.cs
+++ b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/AnnotationService.cs
@@ -12,7 +12,7 @@ namespace EnvelopeGenerator.WebUI.Client.Services;
 /// During development, <c>BaseUrl</c> is empty so the request resolves to the
 /// YARP-proxied route on the same origin, which currently serves
 /// <c>fake-data/annotations.json</c>. To switch to real data, update the
-/// YARP route in <c>yarp.json</c> – no code change required.
+/// YARP route in <c>yarp.json</c> — no code change required.
 /// </summary>
 [Obsolete("Use SignatureService.")]
 public class AnnotationService(HttpClient http, IOptions<ApiOptions> apiOptions)
diff --git a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/CustomDataSourceWizardJsonDataConnectionStorage.cs b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/CustomDataSourceWizardJsonDataConnectionStorage.cs
index 8812b0c1..bc4a08eb 100644
--- a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/CustomDataSourceWizardJsonDataConnectionStorage.cs
+++ b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/CustomDataSourceWizardJsonDataConnectionStorage.cs
@@ -1,40 +1,39 @@
-using DevExpress.DataAccess.Json;
+using DevExpress.DataAccess.Json;
 using DevExpress.DataAccess.Web;
 using DevExpress.DataAccess.Wizard.Services;
 
-namespace EnvelopeGenerator.WebUI.Client.Services
+namespace EnvelopeGenerator.WebUI.Client.Services;
+
+public class CustomDataSourceWizardJsonDataConnectionStorage : IDataSourceWizardJsonConnectionStorage
 {
-    public class CustomDataSourceWizardJsonDataConnectionStorage : IDataSourceWizardJsonConnectionStorage
-    {
-        public static JsonDataConnection GetDefaultConnection() {
-            var uriJsonSource = new UriJsonSource() {
-                Uri = new Uri(@"https://raw.githubusercontent.com/DevExpress-Examples/DataSources/master/JSON/customers.json"),
-            };
-            return new JsonDataConnection(uriJsonSource) { StoreConnectionNameOnly = true, Name = "NWindProductsJson" };
-        }
-        public static List<JsonDataConnection> GetConnections() {
-            var connections = new List<JsonDataConnection> {
-                GetDefaultConnection()
-            };
-            return connections;
-        }
-
-        bool IJsonConnectionStorageService.CanSaveConnection => false;
-        bool IJsonConnectionStorageService.ContainsConnection(string connectionName) {
-            return GetConnections().Any(x => x.Name == connectionName);
-        }
-
-        IEnumerable<JsonDataConnection> IJsonConnectionStorageService.GetConnections() {
-            return GetConnections();
-        }
-
-        JsonDataConnection IJsonDataConnectionProviderService.GetJsonDataConnection(string name) {
-            var connection = GetConnections().FirstOrDefault(x => x.Name == name);
-            if(connection == null)
-                throw new InvalidOperationException();
-            return connection;
-        }
-
-        void IJsonConnectionStorageService.SaveConnection(string connectionName, JsonDataConnection connection, bool saveCredentials) { }
+    public static JsonDataConnection GetDefaultConnection() {
+        var uriJsonSource = new UriJsonSource() {
+            Uri = new Uri(@"https://raw.githubusercontent.com/DevExpress-Examples/DataSources/master/JSON/customers.json"),
+        };
+        return new JsonDataConnection(uriJsonSource) { StoreConnectionNameOnly = true, Name = "NWindProductsJson" };
     }
-}
+    public static List<JsonDataConnection> GetConnections() {
+        var connections = new List<JsonDataConnection> {
+            GetDefaultConnection()
+        };
+        return connections;
+    }
+
+    bool IJsonConnectionStorageService.CanSaveConnection => false;
+    bool IJsonConnectionStorageService.ContainsConnection(string connectionName) {
+        return GetConnections().Any(x => x.Name == connectionName);
+    }
+
+    IEnumerable<JsonDataConnection> IJsonConnectionStorageService.GetConnections() {
+        return GetConnections();
+    }
+
+    JsonDataConnection IJsonDataConnectionProviderService.GetJsonDataConnection(string name) {
+        var connection = GetConnections().FirstOrDefault(x => x.Name == name);
+        if(connection == null)
+            throw new InvalidOperationException();
+        return connection;
+    }
+
+    void IJsonConnectionStorageService.SaveConnection(string connectionName, JsonDataConnection connection, bool saveCredentials) { }
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/CustomJsonDataConnectionProviderFactory.cs b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/CustomJsonDataConnectionProviderFactory.cs
index bbe9be74..29666afa 100644
--- a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/CustomJsonDataConnectionProviderFactory.cs
+++ b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/CustomJsonDataConnectionProviderFactory.cs
@@ -1,24 +1,23 @@
-using DevExpress.DataAccess.Json;
+using DevExpress.DataAccess.Json;
 using DevExpress.DataAccess.Web;
-namespace EnvelopeGenerator.WebUI.Client.Services
-{
-    public class CustomJsonDataConnectionProviderFactory : IJsonDataConnectionProviderFactory {
-        public IJsonDataConnectionProviderService Create() {
-            return new WebDocumentViewerJsonDataConnectionProvider(CustomDataSourceWizardJsonDataConnectionStorage.GetConnections());
-        }
-    }
+namespace EnvelopeGenerator.WebUI.Client.Services;
 
-    public class WebDocumentViewerJsonDataConnectionProvider : IJsonDataConnectionProviderService
-    {
-        readonly List<JsonDataConnection> jsonDataConnections;
-        public WebDocumentViewerJsonDataConnectionProvider(List<JsonDataConnection> jsonDataConnections) {
-            this.jsonDataConnections = jsonDataConnections;
-        }
-        public JsonDataConnection GetJsonDataConnection(string name) {
-            var connection = jsonDataConnections.FirstOrDefault(x => x.Name == name);
-            if(connection == null)
-                throw new InvalidOperationException();
-            return connection;
-        }
+public class CustomJsonDataConnectionProviderFactory : IJsonDataConnectionProviderFactory {
+    public IJsonDataConnectionProviderService Create() {
+        return new WebDocumentViewerJsonDataConnectionProvider(CustomDataSourceWizardJsonDataConnectionStorage.GetConnections());
     }
 }
+
+public class WebDocumentViewerJsonDataConnectionProvider : IJsonDataConnectionProviderService
+{
+    readonly List<JsonDataConnection> jsonDataConnections;
+    public WebDocumentViewerJsonDataConnectionProvider(List<JsonDataConnection> jsonDataConnections) {
+        this.jsonDataConnections = jsonDataConnections;
+    }
+    public JsonDataConnection GetJsonDataConnection(string name) {
+        var connection = jsonDataConnections.FirstOrDefault(x => x.Name == name);
+        if(connection == null)
+            throw new InvalidOperationException();
+        return connection;
+    }
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/CustomReportProvider.cs b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/CustomReportProvider.cs
index a32769e6..d26d0a20 100644
--- a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/CustomReportProvider.cs
+++ b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/CustomReportProvider.cs
@@ -1,21 +1,20 @@
-using DevExpress.XtraReports.UI;
+using DevExpress.XtraReports.UI;
 using DevExpress.XtraReports.Services;
 using EnvelopeGenerator.WebUI.Client.PredefinedReports;
 
-namespace EnvelopeGenerator.WebUI.Client.Services
-{
-    public class CustomReportProvider : IReportProviderAsync {
-        private readonly InMemoryReportStorageWebExtension reportStorage;
+namespace EnvelopeGenerator.WebUI.Client.Services;
 
-        public CustomReportProvider(InMemoryReportStorageWebExtension reportStorage) {
-            this.reportStorage = reportStorage;
-        }
+public class CustomReportProvider : IReportProviderAsync {
+    private readonly InMemoryReportStorageWebExtension reportStorage;
 
-        public Task<XtraReport> GetReportAsync(string id, ReportProviderContext context) {
-            if(reportStorage.TryGetReport(id, out var savedReport))
-                return Task.FromResult(savedReport);
-
-            return Task.FromResult(ReportsFactory.GetReport(id));
-        }
+    public CustomReportProvider(InMemoryReportStorageWebExtension reportStorage) {
+        this.reportStorage = reportStorage;
     }
-}
+
+    public Task<XtraReport> GetReportAsync(string id, ReportProviderContext context) {
+        if(reportStorage.TryGetReport(id, out var savedReport))
+            return Task.FromResult(savedReport);
+
+        return Task.FromResult(ReportsFactory.GetReport(id));
+    }
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/FontLoader.cs b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/FontLoader.cs
index aa48b9bb..32cb5bd2 100644
--- a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/FontLoader.cs
+++ b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/FontLoader.cs
@@ -1,12 +1,12 @@
-using DevExpress.Drawing;
+using DevExpress.Drawing;
 
-namespace EnvelopeGenerator.WebUI.Client.Services {
-    public static class FontLoader {
-        public async static Task LoadFonts(HttpClient httpClient, List<string> fontNames) {
-            foreach(var fontName in fontNames) {
-                var fontBytes = await httpClient.GetByteArrayAsync($"fonts/{fontName}");
-                DXFontRepository.Instance.AddFont(fontBytes);
-            }
+namespace EnvelopeGenerator.WebUI.Client.Services;
+
+public static class FontLoader {
+    public async static Task LoadFonts(HttpClient httpClient, List<string> fontNames) {
+        foreach(var fontName in fontNames) {
+            var fontBytes = await httpClient.GetByteArrayAsync($"fonts/{fontName}");
+            DXFontRepository.Instance.AddFont(fontBytes);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/ObjectDataSourceWizardCustomTypeProvider.cs b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/ObjectDataSourceWizardCustomTypeProvider.cs
index 4aba423d..e4d67d00 100644
--- a/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/ObjectDataSourceWizardCustomTypeProvider.cs
+++ b/EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Services/ObjectDataSourceWizardCustomTypeProvider.cs
@@ -1,9 +1,9 @@
-using DevExpress.DataAccess.Web;
+using DevExpress.DataAccess.Web;
 
-namespace EnvelopeGenerator.WebUI.Client.Services {
-    public class ObjectDataSourceWizardCustomTypeProvider : IObjectDataSourceWizardTypeProvider {
-        public IEnumerable<Type> GetAvailableTypes(string context) {
-            return new[] { typeof(Data.DataItemList) };
-        }
+namespace EnvelopeGenerator.WebUI.Client.Services;
+
+public class ObjectDataSourceWizardCustomTypeProvider : IObjectDataSourceWizardTypeProvider {
+    public IEnumerable<Type> GetAvailableTypes(string context) {
+        return new[] { typeof(Data.DataItemList) };
     }
-}
+}
\ No newline at end of file