diff --git a/packages/core/minos-microservice-networks/minos/networks/__init__.py b/packages/core/minos-microservice-networks/minos/networks/__init__.py
index a6b81ea39..0a5b567f8 100644
--- a/packages/core/minos-microservice-networks/minos/networks/__init__.py
+++ b/packages/core/minos-microservice-networks/minos/networks/__init__.py
@@ -55,6 +55,8 @@
     EnrouteBuilder,
     EnrouteDecorator,
     EnrouteDecoratorKind,
+    GraphqlEnrouteDecorator,
+    GraphqlQueryEnrouteDecorator,
     Handler,
     HandlerMeta,
     HandlerWrapper,
@@ -63,8 +65,6 @@
     RestCommandEnrouteDecorator,
     RestEnrouteDecorator,
     RestQueryEnrouteDecorator,
-    GraphqlEnrouteDecorator,
-    GraphqlQueryEnrouteDecorator,
     enroute,
 )
 from .discovery import (
diff --git a/packages/core/minos-microservice-networks/minos/networks/decorators/__init__.py b/packages/core/minos-microservice-networks/minos/networks/decorators/__init__.py
index 08529cf15..521edd8fc 100644
--- a/packages/core/minos-microservice-networks/minos/networks/decorators/__init__.py
+++ b/packages/core/minos-microservice-networks/minos/networks/decorators/__init__.py
@@ -23,11 +23,11 @@
     CheckDecorator,
     EnrouteDecorator,
     EnrouteDecoratorKind,
+    GraphqlEnrouteDecorator,
+    GraphqlQueryEnrouteDecorator,
     PeriodicEnrouteDecorator,
     PeriodicEventEnrouteDecorator,
     RestCommandEnrouteDecorator,
     RestEnrouteDecorator,
     RestQueryEnrouteDecorator,
-    GraphqlEnrouteDecorator,
-    GraphqlQueryEnrouteDecorator,
 )
diff --git a/packages/core/minos-microservice-networks/minos/networks/decorators/analyzers.py b/packages/core/minos-microservice-networks/minos/networks/decorators/analyzers.py
index ba95a1085..ea8f8e4a4 100644
--- a/packages/core/minos-microservice-networks/minos/networks/decorators/analyzers.py
+++ b/packages/core/minos-microservice-networks/minos/networks/decorators/analyzers.py
@@ -24,12 +24,12 @@
     BrokerEventEnrouteDecorator,
     BrokerQueryEnrouteDecorator,
     EnrouteDecorator,
+    GraphqlEnrouteDecorator,
+    GraphqlQueryEnrouteDecorator,
     PeriodicEventEnrouteDecorator,
     RestCommandEnrouteDecorator,
     RestEnrouteDecorator,
     RestQueryEnrouteDecorator,
-    GraphqlEnrouteDecorator,
-    GraphqlQueryEnrouteDecorator,
 )
 
 
diff --git a/packages/core/minos-microservice-networks/minos/networks/decorators/api.py b/packages/core/minos-microservice-networks/minos/networks/decorators/api.py
index 7964f11f8..aab9ae7dd 100644
--- a/packages/core/minos-microservice-networks/minos/networks/decorators/api.py
+++ b/packages/core/minos-microservice-networks/minos/networks/decorators/api.py
@@ -6,10 +6,10 @@
     BrokerCommandEnrouteDecorator,
     BrokerEventEnrouteDecorator,
     BrokerQueryEnrouteDecorator,
+    GraphqlQueryEnrouteDecorator,
     PeriodicEventEnrouteDecorator,
     RestCommandEnrouteDecorator,
     RestQueryEnrouteDecorator,
-    GraphqlQueryEnrouteDecorator
 )
 
 
diff --git a/packages/core/minos-microservice-networks/minos/networks/decorators/definitions/__init__.py b/packages/core/minos-microservice-networks/minos/networks/decorators/definitions/__init__.py
index 8454af195..20f0b6a83 100644
--- a/packages/core/minos-microservice-networks/minos/networks/decorators/definitions/__init__.py
+++ b/packages/core/minos-microservice-networks/minos/networks/decorators/definitions/__init__.py
@@ -10,6 +10,10 @@
 from .checkers import (
     CheckDecorator,
 )
+from .graphql import (
+    GraphqlEnrouteDecorator,
+    GraphqlQueryEnrouteDecorator,
+)
 from .kinds import (
     EnrouteDecoratorKind,
 )
@@ -22,7 +26,3 @@
     RestEnrouteDecorator,
     RestQueryEnrouteDecorator,
 )
-from .graphql import (
-    GraphqlEnrouteDecorator,
-    GraphqlQueryEnrouteDecorator
-)
diff --git a/packages/core/minos-microservice-networks/tests/services/graphql.py b/packages/core/minos-microservice-networks/tests/services/graphql.py
index 594089bf5..b4cc7d4f4 100644
--- a/packages/core/minos-microservice-networks/tests/services/graphql.py
+++ b/packages/core/minos-microservice-networks/tests/services/graphql.py
@@ -8,7 +8,4 @@
 class GraphqlService:
     @enroute.graphql(url="/graphql", method="POST")
     def add_ticket(self, request: Request) -> Response:
-        return Response({
-          "data": {},
-          "errors": []
-        })
+        return Response({"data": {}, "errors": []})
diff --git a/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_analyzers.py b/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_analyzers.py
index c04cb393c..a8fe39b6e 100644
--- a/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_analyzers.py
+++ b/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_analyzers.py
@@ -8,10 +8,10 @@
     BrokerEventEnrouteDecorator,
     BrokerQueryEnrouteDecorator,
     EnrouteAnalyzer,
+    GraphqlQueryEnrouteDecorator,
     PeriodicEventEnrouteDecorator,
     RestCommandEnrouteDecorator,
     RestQueryEnrouteDecorator,
-    GraphqlQueryEnrouteDecorator,
 )
 from tests.utils import (
     FakeService,
diff --git a/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_api.py b/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_api.py
index ffd123128..af8e1fd9e 100644
--- a/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_api.py
+++ b/packages/core/minos-microservice-networks/tests/test_networks/test_decorators/test_api.py
@@ -4,10 +4,10 @@
     BrokerCommandEnrouteDecorator,
     BrokerEventEnrouteDecorator,
     BrokerQueryEnrouteDecorator,
+    GraphqlQueryEnrouteDecorator,
     PeriodicEventEnrouteDecorator,
     RestCommandEnrouteDecorator,
     RestQueryEnrouteDecorator,
-    GraphqlQueryEnrouteDecorator,
     enroute,
 )
 
diff --git a/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/graphql_example.py b/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/graphql_example.py
index c3eb4b24e..e17e52148 100644
--- a/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/graphql_example.py
+++ b/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/graphql_example.py
@@ -1,16 +1,18 @@
 import asyncio
+
 from graphql import (
-    graphql, GraphQLSchema, GraphQLObjectType, GraphQLField, GraphQLString)
+    GraphQLField,
+    GraphQLObjectType,
+    GraphQLSchema,
+    GraphQLString,
+    graphql,
+)
 
 
 def resolve_hello(obj, info):
-    return 'world'
+    return "world"
+
 
 schema = GraphQLSchema(
-    query=GraphQLObjectType(
-        name='RootQueryType',
-        fields={
-            'hello': GraphQLField(
-                GraphQLString,
-                resolve=resolve_hello)
-        }))
+    query=GraphQLObjectType(name="RootQueryType", fields={"hello": GraphQLField(GraphQLString, resolve=resolve_hello)})
+)
diff --git a/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/handlers.py b/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/handlers.py
index 8da0723f7..cad7ce722 100644
--- a/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/handlers.py
+++ b/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/handlers.py
@@ -20,6 +20,9 @@
 from aiohttp import (
     web,
 )
+from graphql_server.aiohttp import (
+    GraphQLView,
+)
 
 from minos.common import (
     MinosConfig,
@@ -31,15 +34,15 @@
     ResponseException,
 )
 
+from .graphql_example import (
+    schema,
+)
 from .requests import (
     RestRequest,
 )
 from .responses import (
     RestResponse,
 )
-from graphql_server.aiohttp import GraphQLView
-
-from .graphql_example import schema
 
 logger = logging.getLogger(__name__)
 
@@ -102,7 +105,7 @@ def get_app(self) -> web.Application:
     @cached_property
     def _app(self) -> web.Application:
         app = web.Application()
-        #self._mount_routes(app)
+        # self._mount_routes(app)
         self._mount_graphql(app)
         return app
 
diff --git a/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/main.py b/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/main.py
index 87695eafb..b751c179b 100644
--- a/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/main.py
+++ b/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/main.py
@@ -1,5 +1,10 @@
-from aiohttp import web
-from minos.plugins.graphql_aiohttp.services import RestService
+from aiohttp import (
+    web,
+)
+
+from minos.plugins.graphql_aiohttp.services import (
+    RestService,
+)
 
 
 def main():
diff --git a/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/services.py b/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/services.py
index fd9e6d1b5..c1ff1919c 100644
--- a/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/services.py
+++ b/packages/plugins/minos-graphql-aiohttp/minos/plugins/graphql_aiohttp/services.py
@@ -4,12 +4,16 @@
 from aiomisc.service.aiohttp import (
     AIOHTTPService,
 )
+from graphql_server.aiohttp import (
+    GraphQLView,
+)
+
+from .graphql_example import (
+    schema,
+)
 from .handlers import (
     RestHandler,
 )
-from graphql_server.aiohttp import GraphQLView
-
-from .graphql_example import schema
 
 
 class RestService(AIOHTTPService):
@@ -21,8 +25,8 @@ class RestService(AIOHTTPService):
     """
 
     def __init__(self, **kwargs):
-        #self.handler = RestHandler.from_config(**kwargs)
-        #super().__init__(**(kwargs | {"address": self.handler.host, "port": self.handler.port}))
+        # self.handler = RestHandler.from_config(**kwargs)
+        # super().__init__(**(kwargs | {"address": self.handler.host, "port": self.handler.port}))
         super().__init__(**(kwargs | {"address": "localhost", "port": 7030}))
 
     def _mount_graphql(self, app: web.Application):
@@ -37,5 +41,4 @@ async def create_application(self) -> web.Application:
         # self._mount_routes(app)
         self._mount_graphql(app)
         return app
-        #return self.handler.get_app()  # pragma: no cover
-
+        # return self.handler.get_app()  # pragma: no cover