diff --git a/RhSolutions.AddIn/AddIn/ResetBarFunction.cs b/RhSolutions.AddIn/AddIn/ResetBarFunction.cs
index bd0a591..a1a34fa 100644
--- a/RhSolutions.AddIn/AddIn/ResetBarFunction.cs
+++ b/RhSolutions.AddIn/AddIn/ResetBarFunction.cs
@@ -1,13 +1,10 @@
-using ExcelDna.Integration;
+namespace RhSolutions.AddIn;
 
-namespace RhSolutions.AddIn
+public static class ResetBarFunction
 {
-    public static class ResetBarFunction
+    [ExcelFunction]
+    public static void _ResetStatusBar()
     {
-        [ExcelFunction]
-        public static void _ResetStatusBar()
-        {
-            RhSolutionsAddIn.Excel.StatusBar = false;
-        }
+        RhSolutionsAddIn.Excel.StatusBar = false;
     }
 }
\ No newline at end of file
diff --git a/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs b/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
index aad1302..796e540 100644
--- a/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
+++ b/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
@@ -1,43 +1,37 @@
-using ExcelDna.Integration;
-using ExcelDna.IntelliSense;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Office.Interop.Excel;
-using RhSolutions.Services;
-using System;
+using ExcelDna.IntelliSense;
 using System.Net;
 
-namespace RhSolutions.AddIn
+namespace RhSolutions.AddIn;
+
+public sealed class RhSolutionsAddIn : IExcelAddIn
 {
-    public sealed class RhSolutionsAddIn : IExcelAddIn
+    public static Application Excel { get; private set; }
+    public static ServiceProvider ServiceProvider { get; set; }
+    public static IAddInConfiguration Configuration { get; set; }
+
+    public void AutoOpen()
     {
-        public static Application Excel { get; private set; }
-        public static ServiceProvider ServiceProvider { get; set; }
-        public static IAddInConfiguration Configuration { get; set; }
+        IServiceCollection Services = new ServiceCollection();
 
-        public void AutoOpen()
-        {
-            IServiceCollection Services = new ServiceCollection();
+        Services.AddHttpClient()
+            .AddSingleton<IDatabaseClient, RhDatabaseClient>()
+            .AddSingleton<IAddInConfiguration, AddInConfiguration>()
+            .AddSingleton((Application)ExcelDnaUtil.Application);
 
-            Services.AddHttpClient()
-                .AddSingleton<IDatabaseClient, RhDatabaseClient>()
-                .AddSingleton<IAddInConfiguration, AddInConfiguration>()
-                .AddSingleton((Application)ExcelDnaUtil.Application);
+        ServiceProvider = Services.BuildServiceProvider();
+        Configuration = ServiceProvider.GetService<IAddInConfiguration>();
+        Excel = ServiceProvider.GetService<Application>();
 
-            ServiceProvider = Services.BuildServiceProvider();
-            Configuration = ServiceProvider.GetService<IAddInConfiguration>();
-            Excel = ServiceProvider.GetService<Application>();
+        IntelliSenseServer.Install();
+        EventsUtil.Initialize();
 
-            IntelliSenseServer.Install();
-            EventsUtil.Initialize();
+        ServicePointManager.SecurityProtocol =
+            SecurityProtocolType.Tls12;
+    }
 
-            ServicePointManager.SecurityProtocol =
-                SecurityProtocolType.Tls12;
-        }
-
-        public void AutoClose()
-        {
-            IntelliSenseServer.Uninstall();
-            EventsUtil.Uninitialize();
-        }
+    public void AutoClose()
+    {
+        IntelliSenseServer.Uninstall();
+        EventsUtil.Uninitialize();
     }
 }
diff --git a/RhSolutions.AddIn/Usings.cs b/RhSolutions.AddIn/Usings.cs
new file mode 100644
index 0000000..1047bda
--- /dev/null
+++ b/RhSolutions.AddIn/Usings.cs
@@ -0,0 +1,5 @@
+global using ExcelDna.Integration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Office.Interop.Excel;
+global using RhSolutions.Services;
+global using System;
\ No newline at end of file