diff --git a/sc2reader/engine/engine.py b/sc2reader/engine/engine.py
index 9c7ee68f..96b7f759 100644
--- a/sc2reader/engine/engine.py
+++ b/sc2reader/engine/engine.py
@@ -1,5 +1,12 @@
 import collections
-from sc2reader.events import *
+from sc2reader.events import (
+    CommandEvent,
+    ControlGroupEvent,
+    Event,
+    GameEvent,
+    MessageEvent,
+    TrackerEvent,
+)
 from sc2reader.engine.events import InitGameEvent, EndGameEvent, PluginExit
 
 
diff --git a/sc2reader/objects.py b/sc2reader/objects.py
index 9a7a0e8b..0b90e140 100644
--- a/sc2reader/objects.py
+++ b/sc2reader/objects.py
@@ -4,7 +4,7 @@
 
 from sc2reader import utils, log_utils
 from sc2reader.decoders import ByteDecoder
-from sc2reader.constants import *
+from sc2reader.constants import GATEWAY_LOOKUP, LOBBY_PROPERTIES, LOCALIZED_RACES
 
 Location = namedtuple("Location", ["x", "y"])
 
diff --git a/sc2reader/readers.py b/sc2reader/readers.py
index 77fb681d..f65ee0ed 100644
--- a/sc2reader/readers.py
+++ b/sc2reader/readers.py
@@ -1,10 +1,33 @@
 import struct
 
 from sc2reader.exceptions import ParseError, ReadError
-from sc2reader.objects import *
-from sc2reader.events.game import *
-from sc2reader.events.message import *
-from sc2reader.events.tracker import *
+from sc2reader.objects import Attribute
+from sc2reader.events.game import (
+    CameraEvent,
+    CommandManagerStateEvent,
+    HijackReplayGameEvent,
+    PlayerLeaveEvent,
+    ResourceTradeEvent,
+    SelectionEvent,
+    UpdateTargetPointCommandEvent,
+    UpdateTargetUnitCommandEvent,
+    UserOptionsEvent,
+    create_command_event,
+    create_control_group_event,
+)
+from sc2reader.events.message import ChatEvent, PingEvent, ProgressEvent
+from sc2reader.events.tracker import (
+    PlayerSetupEvent,
+    PlayerStatsEvent,
+    UnitBornEvent,
+    UnitDiedEvent,
+    UnitDoneEvent,
+    UnitInitEvent,
+    UnitOwnerChangeEvent,
+    UnitPositionsEvent,
+    UnitTypeChangeEvent,
+    UpgradeCompleteEvent,
+)
 from sc2reader.utils import DepotFile
 from sc2reader.decoders import BitPackedDecoder, ByteDecoder
 
diff --git a/sc2reader/scripts/sc2replayer.py b/sc2reader/scripts/sc2replayer.py
index d78410b0..06f97acd 100755
--- a/sc2reader/scripts/sc2replayer.py
+++ b/sc2reader/scripts/sc2replayer.py
@@ -37,7 +37,14 @@ def getch():
 
 import argparse
 import sc2reader
-from sc2reader.events import *
+from sc2reader.events import (
+    CameraEvent,
+    CommandEvent,
+    ControlGroupEvent,
+    GameStartEvent,
+    PlayerLeaveEvent,
+    SelectionEvent,
+)
 
 
 def main():
@@ -99,7 +106,7 @@ def main():
                 or isinstance(event, SelectionEvent)
                 or isinstance(event, PlayerLeaveEvent)
                 or isinstance(event, GameStartEvent)
-                or (args.hotkeys and isinstance(event, HotkeyEvent))
+                or (args.hotkeys and isinstance(event, ControlGroupEvent))
                 or (args.cameras and isinstance(event, CameraEvent))
             ):
                 print(event)