diff --git a/Client/Program.cs b/Client/Program.cs
index 34eee04f..c64e212e 100644
--- a/Client/Program.cs
+++ b/Client/Program.cs
@@ -21,12 +21,17 @@ private static void Main(string[] args)
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
+
             Settings.Initialize();
             Initialize();
             if (!SystemCore.Disconnect)
                 Connect();
 
-            //close here
+            Cleanup();
+        }
+
+        private static void Cleanup()
+        {
             CommandHandler.CloseShell();
             if (_appMutex != null)
                 _appMutex.Close();