diff --git a/src/mercury_engine_data_structures/formats/bmssd.py b/src/mercury_engine_data_structures/formats/bmssd.py
index c221051..698ff97 100644
--- a/src/mercury_engine_data_structures/formats/bmssd.py
+++ b/src/mercury_engine_data_structures/formats/bmssd.py
@@ -20,7 +20,6 @@
 from mercury_engine_data_structures.base_resource import BaseResource
 from mercury_engine_data_structures.common_types import CVector3D, StrId, VersionAdapter, make_dict, make_vector
 from mercury_engine_data_structures.crc import crc32, crc64
-from mercury_engine_data_structures.game_check import Game
 
 TransformStruct = Struct("position" / CVector3D, "rotation" / CVector3D, "scale" / CVector3D)
 
@@ -157,7 +156,7 @@ def obj_to_tuple(o):
         for o in obj._objects:
             objects[o["model_name"]].append(o)
 
-        object_order = dict()
+        object_order = {}
         object_containers = construct.ListContainer()
         i = 0
         for name, objs in objects.items():
@@ -172,9 +171,9 @@ def obj_to_tuple(o):
 
         res = construct.Container(
             _version=obj._version,
-            scene_blocks=[blk for blk in obj._scene_blocks.values()],
+            scene_blocks=obj._scene_blocks.values(),
             objects=object_containers,
-            lights=[lgt for lgt in obj._lights.values()],
+            lights=obj._lights.values(),
             scene_groups=construct.ListContainer(),
         )
 
@@ -212,7 +211,7 @@ def __new__(cls, value: int, group_name: str):
 
 class Bmssd(BaseResource):
     @classmethod
-    def construct_class(cls, target_game: Game) -> Construct:
+    def construct_class(cls, target_game: game_check.Game) -> Construct:
         return BmssdAdapter(BMSSD)
 
     def get_item(self, item_name_or_id: str | int, item_type: ItemType) -> construct.Container: