diff --git a/src/openstack_mcp_server/tools/base.py b/src/openstack_mcp_server/tools/base.py
index 2ef633b..03333ad 100644
--- a/src/openstack_mcp_server/tools/base.py
+++ b/src/openstack_mcp_server/tools/base.py
@@ -10,18 +10,18 @@ class OpenStackConnectionManager:
 
     _connection: connection.Connection | None = None
 
-    # TODO: Try/Catch disconnection by token expired case
     @classmethod
     def get_connection(cls) -> connection.Connection:
-        """OpenStack Connection)"""
+        """OpenStack Connection"""
         if cls._connection is None:
             openstack.enable_logging(debug=config.MCP_DEBUG_MODE)
             cls._connection = openstack.connect(cloud=config.MCP_CLOUD_NAME)
         return cls._connection
 
-    # TODO: Close connection
+
+_openstack_connection_manager = OpenStackConnectionManager()
 
 
 def get_openstack_conn():
     """Get OpenStack Connection"""
-    return OpenStackConnectionManager.get_connection()
+    return _openstack_connection_manager.get_connection()