diff --git a/findmyorder/main.py b/findmyorder/main.py
index 500e7722..c3736b1f 100644
--- a/findmyorder/main.py
+++ b/findmyorder/main.py
@@ -22,13 +22,12 @@
 
 
 class FindMyOrder:
-    """find an order class """
+    """find an order class"""
 
     def __init__(
         self,
     ):
         self.logger = logger
-        # logging.getLogger(name="FMO")
 
     async def search(
         self,
@@ -37,50 +36,51 @@ async def search(
         """Search an order."""
         if my_string:
             string_check = my_string.split()[0].lower()
+            self.debug(string_check)
             if string_check in settings.action_identifier.lower():
                 return True
         return False
 
+    async def get_info(self):
+        """get info about the class"""
+        return f"{__class__.__name__} {__version__}\n"
+
     async def contains_emoji(self, input_string: str) -> bool:
         """Check if the input string contains an emoji."""
         return any(emoji.is_emoji(character) for character in input_string)
 
     async def identify_order(
-            self,
-            my_string: str,
-            ) -> dict:
+        self,
+        my_string: str,
+    ) -> dict:
         """Identify an order."""
         try:
-            action = one_of(
-                settings.action_identifier, caseless=True
-                ).set_results_name("action").set_parse_action(
-                    pyparsing_common.upcase_tokens)
-            instrument = Word(
-                alphas
-                ).set_results_name("instrument")
+            action = (
+                one_of(settings.action_identifier, caseless=True)
+                .set_results_name("action")
+                .set_parse_action(pyparsing_common.upcase_tokens)
+            )
+            instrument = Word(alphas).set_results_name("instrument")
             stop_loss = Combine(
-                    Suppress(settings.stop_loss_identifier)
-                    + Word(nums)
-                ).set_results_name("stop_loss")
+                Suppress(settings.stop_loss_identifier) + Word(nums)
+            ).set_results_name("stop_loss")
             take_profit = Combine(
-                Suppress(settings.take_profit_identifier)
-                + Word(nums)
-                ).set_results_name("take_profit")
+                Suppress(settings.take_profit_identifier) + Word(nums)
+            ).set_results_name("take_profit")
             quantity = Combine(
                 Suppress(settings.quantity_identifier)
                 + Word(nums)
                 + Optional(Suppress("%"))
-                ).set_results_name("quantity")
+            ).set_results_name("quantity")
             order_type = one_of(
                 settings.order_type_identifier, caseless=True
-                ).set_results_name("order_type")
+            ).set_results_name("order_type")
             leverage_type = one_of(
                 settings.leverage_type_identifier, caseless=True
-                ).set_results_name("leverage_type")
+            ).set_results_name("leverage_type")
             comment = Combine(
-                    Suppress(settings.comment_identifier)
-                    + Word(alphas)
-                ).set_results_name("comment")
+                Suppress(settings.comment_identifier) + Word(alphas)
+            ).set_results_name("comment")
 
             order_grammar = (
                 action("action")
@@ -91,12 +91,10 @@ async def identify_order(
                 + Optional(order_type, default=None)
                 + Optional(leverage_type, default=None)
                 + Optional(comment, default=None)
-              )
+            )
 
-            order = order_grammar.parse_string(
-                    instring=my_string,
-                    parse_all=False
-                    )
+            order = order_grammar.parse_string(instring=my_string, parse_all=False)
+            self.debug(order)
             return order.asDict()
 
         except Exception as e:
@@ -111,84 +109,20 @@ async def get_order(
             return None
         order = await self.identify_order(msg)
         if isinstance(order, dict):
-            order["timestamp"] = datetime.utcnow().strftime(
-                "%Y-%m-%dT%H:%M:%SZ")
-        print(settings.instrument_mapping)
+            order["timestamp"] = datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
         if settings.instrument_mapping:
             await self.replace_instrument(order)
         if order["instrument"] in settings.ignore_instrument:
-            """ ignoring instrument"""
+            """ignoring instrument"""
             return
+        self.debug(order)
         return order
 
     async def replace_instrument(self, order):
-        """ replace instrument by an alternative instrument """
+        """replace instrument by an alternative instrument"""
         instrument = order["instrument"]
         for item in settings.mapping:
             if item["id"] == instrument:
                 order["instrument"] = item["alt"]
                 break
         return order
-
-    async def get_info(self):
-        """ get info about the class """
-        return f"{__class__.__name__} {__version__}\n"
-
-# Grammar
-# class TradingGrammar:
-#     def __init__(self):
-#         self.action = self._action()
-#         self.instrument = self._instrument()
-#         self.exchange = self._exchange()
-
-# grammar = TradingGrammar()
-
-# new_order_grammar = (
-#     grammar.currency_pair
-#     + grammar.exchange
-#     + grammar.take_profit_targets
-# )
-# CORNIX type
-# currency_pair = Combine(Suppress("#") + Word(alphas + "/") + Word(alphas))\
-#     .set_results_name("currency_pair")
-# exchange = Group(Suppress("Exchanges:")
-# + delimitedList(
-    # Word(alphas + " "),
-    # delim=", ")
-    # ).set_results_name("exchanges")
-# signal_type = Group(
-    # Suppress("Signal Type:")
-    # + Word(alphas + " ()"))
-#     .set_results_name("signal_type")
-# leverage = Group(
-    # Suppress("Leverage:")
-    # + Word(alphas + " (.)"))\
-#     .set_results_name("leverage")
-# entry_targets = Group(Suppress("Entry Targets:")
-# + OneOrMore(Group(Word(nums
-# + ".")
-# + Suppress("-")
-# + Word(nums + ".%")))).set_results_name("entry_targets")
-# take_profit_targets = Group(
-    # Suppress("Take-Profit Targets:")
-    # + OneOrMore(Word(nums + "."))).set_results_name("take_profit_targets")
-# stop_targets = Group(
-    # Suppress("Stop Targets:")
-    # + OneOrMore(Word(nums + "."))).set_results_name("stop_targets")
-# trailing_config = Group(
-    # Suppress("Trailing Configuration:")
-    # + Group(Word(alphas + ":")
-    # + Word(alphas + "-")
-    # + Suppress("Trigger:")
-    # + Word(alphas + " ()"))).set_results_name("trailing_config")
-
-# new_order_grammar = (
-#     currency_pair
-#     + exchange
-#     + signal_type
-#     + leverage
-#     + entry_targets
-#     + take_profit_targets
-#     + stop_targets
-#     + trailing_config
-# )