diff --git a/examples/crypto-trading-basic.ipynb b/examples/crypto-trading-basic.ipynb
index f7264c1f..cc3e2d91 100644
--- a/examples/crypto-trading-basic.ipynb
+++ b/examples/crypto-trading-basic.ipynb
@@ -67,14 +67,33 @@
     "from zoneinfo import ZoneInfo\n",
     "\n",
     "import alpaca\n",
-    "from alpaca.data.live.crypto import *\n",
-    "from alpaca.data.historical.crypto import *\n",
-    "from alpaca.data.requests import *\n",
-    "from alpaca.data.timeframe import *\n",
-    "from alpaca.trading.client import *\n",
-    "from alpaca.trading.stream import *\n",
-    "from alpaca.trading.requests import *\n",
-    "from alpaca.trading.enums import *\n",
+    "from alpaca.trading.client import TradingClient\n",
+    "from alpaca.data.timeframe import TimeFrame, TimeFrameUnit\n",
+    "from alpaca.data.historical.crypto import CryptoHistoricalDataClient\n",
+    "from alpaca.trading.stream import TradingStream\n",
+    "from alpaca.data.live.crypto import CryptoDataStream\n",
+    "\n",
+    "from alpaca.data.requests import (\n",
+    "    CryptoBarsRequest,\n",
+    "    CryptoTradesRequest,\n",
+    "    CryptoLatestQuoteRequest\n",
+    "    )\n",
+    "from alpaca.trading.requests import (\n",
+    "    GetAssetsRequest,\n",
+    "    MarketOrderRequest,\n",
+    "    LimitOrderRequest,\n",
+    "    StopLimitOrderRequest,\n",
+    "    GetOrdersRequest,\n",
+    "    ClosePositionRequest\n",
+    ")\n",
+    "from alpaca.trading.enums import (\n",
+    "    AssetClass,\n",
+    "    AssetStatus,\n",
+    "    OrderSide,\n",
+    "    OrderType,\n",
+    "    TimeInForce,\n",
+    "    QueryOrderStatus\n",
+    ")\n",
     "from alpaca.common.exceptions import APIError"
    ]
   },
@@ -276,7 +295,7 @@
     "orders"
    ]
   },
- {
+  {
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
diff --git a/examples/options-trading-basic.ipynb b/examples/options-trading-basic.ipynb
index d1aae184..adaa57dd 100644
--- a/examples/options-trading-basic.ipynb
+++ b/examples/options-trading-basic.ipynb
@@ -69,14 +69,35 @@
     "from zoneinfo import ZoneInfo\n",
     "\n",
     "import alpaca\n",
-    "from alpaca.data.live.option import *\n",
-    "from alpaca.data.historical.option import *\n",
-    "from alpaca.data.requests import *\n",
-    "from alpaca.data.timeframe import *\n",
-    "from alpaca.trading.client import *\n",
-    "from alpaca.trading.stream import *\n",
-    "from alpaca.trading.requests import *\n",
-    "from alpaca.trading.enums import *\n",
+    "from alpaca.trading.client import TradingClient\n",
+    "from alpaca.data.timeframe import TimeFrame, TimeFrameUnit\n",
+    "from alpaca.data.historical.option import OptionHistoricalDataClient\n",
+    "from alpaca.trading.stream import TradingStream\n",
+    "from alpaca.data.live.option import OptionDataStream\n",
+    "\n",
+    "from alpaca.data.requests import (\n",
+    "    OptionBarsRequest,\n",
+    "    OptionTradesRequest,\n",
+    "    OptionLatestQuoteRequest,\n",
+    "    OptionLatestTradeRequest,\n",
+    "    OptionSnapshotRequest,\n",
+    "    OptionChainRequest    \n",
+    ")\n",
+    "from alpaca.trading.requests import (\n",
+    "    GetOptionContractsRequest,\n",
+    "    GetAssetsRequest,\n",
+    "    MarketOrderRequest,\n",
+    "    GetOrdersRequest,\n",
+    "    ClosePositionRequest\n",
+    ")\n",
+    "from alpaca.trading.enums import (\n",
+    "    AssetStatus,\n",
+    "    ExerciseStyle,\n",
+    "    OrderSide,\n",
+    "    OrderType,\n",
+    "    TimeInForce,\n",
+    "    QueryOrderStatus \n",
+    ")\n",
     "from alpaca.common.exceptions import APIError"
    ]
   },
diff --git a/examples/stocks-trading-basic.ipynb b/examples/stocks-trading-basic.ipynb
index 74357e91..d84b5265 100644
--- a/examples/stocks-trading-basic.ipynb
+++ b/examples/stocks-trading-basic.ipynb
@@ -67,14 +67,38 @@
     "from zoneinfo import ZoneInfo\n",
     "\n",
     "import alpaca\n",
-    "from alpaca.data.live.stock import *\n",
-    "from alpaca.data.historical.stock import *\n",
-    "from alpaca.data.requests import *\n",
-    "from alpaca.data.timeframe import *\n",
-    "from alpaca.trading.client import *\n",
-    "from alpaca.trading.stream import *\n",
-    "from alpaca.trading.requests import *\n",
-    "from alpaca.trading.enums import *\n",
+    "from alpaca.trading.client import TradingClient\n",
+    "from alpaca.data.timeframe import TimeFrame, TimeFrameUnit\n",
+    "from alpaca.data.historical.stock import StockHistoricalDataClient\n",
+    "from alpaca.trading.stream import TradingStream\n",
+    "from alpaca.data.live.stock import StockDataStream\n",
+    "\n",
+    "from alpaca.data.requests import (\n",
+    "    StockBarsRequest,\n",
+    "    StockTradesRequest,\n",
+    "    StockQuotesRequest\n",
+    ")\n",
+    "from alpaca.trading.requests import (\n",
+    "    GetAssetsRequest, \n",
+    "    MarketOrderRequest, \n",
+    "    LimitOrderRequest, \n",
+    "    StopOrderRequest, \n",
+    "    StopLimitOrderRequest, \n",
+    "    TakeProfitRequest, \n",
+    "    StopLossRequest, \n",
+    "    TrailingStopOrderRequest, \n",
+    "    GetOrdersRequest, \n",
+    "    ClosePositionRequest\n",
+    ")\n",
+    "from alpaca.trading.enums import ( \n",
+    "    AssetStatus, \n",
+    "    AssetExchange, \n",
+    "    OrderSide, \n",
+    "    OrderType, \n",
+    "    TimeInForce, \n",
+    "    OrderClass, \n",
+    "    QueryOrderStatus\n",
+    ")\n",
     "from alpaca.common.exceptions import APIError"
    ]
   },
@@ -404,7 +428,7 @@
     "orders"
    ]
   },
- {
+  {
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},