diff --git a/EchoTcpServer/Program.cs b/EchoTcpServer/Program.cs
index 5966c579..7f47378b 100644
--- a/EchoTcpServer/Program.cs
+++ b/EchoTcpServer/Program.cs
@@ -47,7 +47,7 @@ public async Task StartAsync()
         Console.WriteLine("Server shutdown.");
     }
 
-    private async Task HandleClientAsync(TcpClient client, CancellationToken token)
+    private static async Task HandleClientAsync(TcpClient client, CancellationToken token)
     {
         using (NetworkStream stream = client.GetStream())
         {
@@ -112,21 +112,22 @@ public static async Task Main(string[] args)
     }
 }
 
-
-public class UdpTimedSender : IDisposable
+namespace EchoServerNamespace
 {
-    private readonly string _host;
-    private readonly int _port;
-    private readonly UdpClient _udpClient;
-    private Timer _timer;
-
-    public UdpTimedSender(string host, int port)
+    public class UdpTimedSender : IDisposable
     {
-        _host = host;
-        _port = port;
-        _udpClient = new UdpClient();
-    }
+        private readonly string _host;
+        private readonly int _port;
+        private readonly UdpClient _udpClient;
+        private Timer _timer;
 
+        public UdpTimedSender(string host, int port)
+        {
+            _host = host;
+            _port = port;
+            _udpClient = new UdpClient();
+        }
+    }
     public void StartSending(int intervalMilliseconds)
     {
         if (_timer != null)
@@ -170,4 +171,4 @@ public void Dispose()
         StopSending();
         _udpClient.Dispose();
     }
-}
\ No newline at end of file
+}