diff --git a/.gitignore b/.gitignore
index 9a6edea..c59bd38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,6 +132,6 @@ nextcord.log
 
 # data file for bot
 highscores_data.json
-highscores_message_map.json
 highscores_config.json
-deleted_backups/
\ No newline at end of file
+deleted_backups/
+highscores_data/
\ No newline at end of file
diff --git a/data/highscores_data.py b/data/highscores_data.py
index a4cde9e..798047e 100644
--- a/data/highscores_data.py
+++ b/data/highscores_data.py
@@ -36,7 +36,7 @@ class HighscoresData:
             str: Highscores class as a string
         """
         data: dict = {}
-        for guild_id, guild_obj in self._guild_map:
+        for guild_id, guild_obj in self._guild_map.items():
             data[guild_id] = guild_obj.to_dict()
 
         return "Highscores Data\n" + json.dumps(data, indent=4)
@@ -84,8 +84,9 @@ class HighscoresData:
         each file and adds to guild map.
         """
         for data_file in os.listdir(HIGHSCORES_DATA_DIR):
+            guild_id: int = int(data_file.split(".", maxsplit=1)[0])
             with open(f"{HIGHSCORES_DATA_DIR}/{data_file}", encoding="utf-8", mode="r") as file:
-                guild_obj: Guild = Guild.from_dict(json.load(file))
+                guild_obj: Guild = Guild.from_dict(guild_id, json.load(file))
                 self._guild_map[guild_obj.guild_id] = guild_obj
 
     def save_highscores_data(self):