diff --git a/csharp/App/SaliMax/src/MiddlewareClasses/MiddlewareAgent.cs b/csharp/App/SaliMax/src/MiddlewareClasses/MiddlewareAgent.cs
index 51688b92a..32950ff50 100644
--- a/csharp/App/SaliMax/src/MiddlewareClasses/MiddlewareAgent.cs
+++ b/csharp/App/SaliMax/src/MiddlewareClasses/MiddlewareAgent.cs
@@ -9,7 +9,7 @@ namespace InnovEnergy.App.SaliMax.MiddlewareClasses;
 
 public static class MiddlewareAgent
 {
-    public static UdpClient   UdpListener = null!;
+    private static UdpClient   _udpListener = null!;
     private static IPAddress? _controllerIpAddress;
     private static EndPoint? _endPoint;
     
@@ -24,9 +24,9 @@ public static class MiddlewareAgent
         const Int32 udpPort = 9000;
         _endPoint = new IPEndPoint(_controllerIpAddress, udpPort);
 
-        UdpListener = new UdpClient();
-        UdpListener.Client.Blocking = false;
-        UdpListener.Client.Bind(_endPoint);
+        _udpListener = new UdpClient();
+        _udpListener.Client.Blocking = false;
+        _udpListener.Client.Bind(_endPoint);
     }
     
     private static IPAddress FindVpnIp()
@@ -53,7 +53,7 @@ public static class MiddlewareAgent
 
     public static Configuration? SetConfigurationFile()
     {
-        if (UdpListener.Available > 0)
+        if (_udpListener.Available > 0)
         {
 
             IPEndPoint? serverEndpoint = null;
@@ -61,7 +61,7 @@ public static class MiddlewareAgent
             var replyMessage = "ACK";
             var replyData = Encoding.UTF8.GetBytes(replyMessage);
 
-            var udpMessage = UdpListener.Receive(ref serverEndpoint);
+            var udpMessage = _udpListener.Receive(ref serverEndpoint);
             var message = Encoding.UTF8.GetString(udpMessage);
 
             var config = JsonSerializer.Deserialize<Configuration>(message);
@@ -74,13 +74,13 @@ public static class MiddlewareAgent
                                   config.CalibrationChargeDate);
 
                 // Send the reply to the sender's endpoint
-                UdpListener.Send(replyData, replyData.Length, serverEndpoint);
+                _udpListener.Send(replyData, replyData.Length, serverEndpoint);
                 Console.WriteLine($"Replied to {serverEndpoint}: {replyMessage}");
                 return config;
             }
         }
 
-        if (_endPoint != null && !_endPoint.Equals(UdpListener.Client.LocalEndPoint as IPEndPoint))
+        if (_endPoint != null && !_endPoint.Equals(_udpListener.Client.LocalEndPoint as IPEndPoint))
         {
             Console.WriteLine("UDP address has changed, rebinding...");
             InitializeCommunicationToMiddleware();
diff --git a/csharp/App/SaliMax/src/Program.cs b/csharp/App/SaliMax/src/Program.cs
index c473f3945..b22d0c20a 100644
--- a/csharp/App/SaliMax/src/Program.cs
+++ b/csharp/App/SaliMax/src/Program.cs
@@ -593,7 +593,7 @@ internal static class Program
                     if (upperVoltage <= configFile.GridTie.AcDc.MaxDcLinkVoltage)
                     {
                         _curtailFlag     = false;
-                        upperVoltage  = configFile.GridTie.AcDc.MaxDcLinkVoltage;
+                        upperVoltage     = configFile.GridTie.AcDc.MaxDcLinkVoltage;
                         upperVoltage.WriteLine(" New Upper limit");
                         Console.WriteLine("Upper Voltage decreased: Smaller than the default value, value clamped");
                     }