diff --git a/freqtrade/persistence/migrations.py b/freqtrade/persistence/migrations.py
index cc33be87c..c81a4156c 100644
--- a/freqtrade/persistence/migrations.py
+++ b/freqtrade/persistence/migrations.py
@@ -65,7 +65,7 @@ def migrate_trades_table(decl_base, inspector, engine, table_back_name: str, col
     close_profit_abs = get_column_def(
         cols, 'close_profit_abs',
         f"(amount * close_rate * (1 - {fee_close})) - {open_trade_value}")
-    # TODO-mg: update to exit order status
+    # TODO-lev: update to exit order status
     sell_order_status = get_column_def(cols, 'sell_order_status', 'null')
     amount_requested = get_column_def(cols, 'amount_requested', 'amount')
 
diff --git a/freqtrade/persistence/models.py b/freqtrade/persistence/models.py
index 0a9edb267..2d8aa0738 100644
--- a/freqtrade/persistence/models.py
+++ b/freqtrade/persistence/models.py
@@ -265,11 +265,13 @@ class LocalTrade():
     buy_tag: Optional[str] = None
     timeframe: Optional[int] = None
 
+    # Leverage trading properties
+    is_short: bool = False
+    isolated_liq: Optional[float] = None
+    leverage: float = 1.0
+
     # Margin trading properties
     interest_rate: float = 0.0
-    isolated_liq: Optional[float] = None
-    is_short: bool = False
-    leverage: float = 1.0
 
     @property
     def has_no_leverage(self) -> bool:
@@ -471,12 +473,12 @@ class LocalTrade():
 
         if self.is_short:
             new_loss = float(current_price * (1 + abs(stoploss)))
-            # If trading on margin, don't set the stoploss below the liquidation price
+            # If trading with leverage, don't set the stoploss below the liquidation price
             if self.isolated_liq:
                 new_loss = min(self.isolated_liq, new_loss)
         else:
             new_loss = float(current_price * (1 - abs(stoploss)))
-            # If trading on margin, don't set the stoploss below the liquidation price
+            # If trading with leverage, don't set the stoploss below the liquidation price
             if self.isolated_liq:
                 new_loss = max(self.isolated_liq, new_loss)
 
@@ -497,7 +499,8 @@ class LocalTrade():
             lower_stop = new_loss < self.stop_loss
 
             # stop losses only walk up, never down!,
-            #   ? But adding more to a margin account would create a lower liquidation price,
+            # TODO-lev
+            #   ? But adding more to a leveraged trade would create a lower liquidation price,
             #   ? decreasing the minimum stoploss
             if (higher_stop and not self.is_short) or (lower_stop and self.is_short):
                 logger.debug(f"{self.pair} - Adjusting stoploss...")
@@ -545,10 +548,11 @@ class LocalTrade():
         elif order_type in ('market', 'limit') and self.exit_side == order['side']:
             if self.is_open:
                 payment = "BUY" if self.is_short else "SELL"
-                # TODO-mg: On shorts, you buy a little bit more than the amount (amount + interest)
+                # TODO-lev: On shorts, you buy a little bit more than the amount (amount + interest)
                 # This wll only print the original amount
                 logger.info(f'{order_type.upper()}_{payment} has been fulfilled for {self}.')
-            self.close(safe_value_fallback(order, 'average', 'price'))  # TODO-mg: Double check this
+            # TODO-lev: Double check this
+            self.close(safe_value_fallback(order, 'average', 'price'))
         elif order_type in ('stop_loss_limit', 'stop-loss', 'stop-loss-limit', 'stop'):
             self.stoploss_order_id = None
             self.close_rate_requested = self.stop_loss
@@ -883,18 +887,19 @@ class Trade(_DECL_BASE, LocalTrade):
     max_rate = Column(Float, nullable=True, default=0.0)
     # Lowest price reached
     min_rate = Column(Float, nullable=True)
-    sell_reason = Column(String(100), nullable=True)  # TODO-mg: Change to close_reason
-    sell_order_status = Column(String(100), nullable=True)  # TODO-mg: Change to close_order_status
+    sell_reason = Column(String(100), nullable=True)  # TODO-lev: Change to close_reason
+    sell_order_status = Column(String(100), nullable=True)  # TODO-lev: Change to close_order_status
     strategy = Column(String(100), nullable=True)
     buy_tag = Column(String(100), nullable=True)
     timeframe = Column(Integer, nullable=True)
 
-    # Margin trading properties
+    # Leverage trading properties
     leverage = Column(Float, nullable=True, default=1.0)
-    interest_rate = Column(Float, nullable=False, default=0.0)
-    isolated_liq = Column(Float, nullable=True)
     is_short = Column(Boolean, nullable=False, default=False)
-    # End of margin trading properties
+    isolated_liq = Column(Float, nullable=True)
+
+    # Margin Trading Properties
+    interest_rate = Column(Float, nullable=False, default=0.0)
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/tests/conftest_trades.py b/tests/conftest_trades.py
index faba18371..8788041d5 100644
--- a/tests/conftest_trades.py
+++ b/tests/conftest_trades.py
@@ -379,7 +379,7 @@ def short_trade(fee):
         open_order_id='dry_run_exit_short_12345',
         strategy='DefaultStrategy',
         timeframe=5,
-        sell_reason='sell_signal',  # TODO-mg: Update to exit/close reason
+        sell_reason='sell_signal',  # TODO-lev: Update to exit/close reason
         open_date=datetime.now(tz=timezone.utc) - timedelta(minutes=20),
         # close_date=datetime.now(tz=timezone.utc) - timedelta(minutes=2),
         is_short=True
@@ -468,7 +468,7 @@ def leverage_trade(fee):
         open_order_id='dry_run_leverage_buy_12368',
         strategy='DefaultStrategy',
         timeframe=5,
-        sell_reason='sell_signal',  # TODO-mg: Update to exit/close reason
+        sell_reason='sell_signal',  # TODO-lev: Update to exit/close reason
         open_date=datetime.now(tz=timezone.utc) - timedelta(minutes=300),
         close_date=datetime.now(tz=timezone.utc),
         interest_rate=0.0005