diff --git a/src/aniworld/execute.py b/src/aniworld/execute.py
index b2ec7bd..8a2fca5 100644
--- a/src/aniworld/execute.py
+++ b/src/aniworld/execute.py
@@ -364,23 +364,21 @@ def get_language_from_key(key: int) -> str:
         return language
 
     file_name = (
-        f"{sanitize_anime_title} - S{params['season_number']}E{params['episode_number']} - ("
-        f"{get_language_from_key(int(params['language']))}).mp4"
+        f"{sanitize_anime_title} - S{params['season_number']}E{params['episode_number']}"
         if params['season_number']
-        else f"{sanitize_anime_title} - Movie {params['episode_number']} - ("
-        f"{get_language_from_key(int(params['language']))}).mp4"
+        else f"{sanitize_anime_title} - Movie {params['episode_number']}"
     )
 
-    if os.getenv("OUTPUT_DIRECTORY"):
-        output_directory = os.getenv("OUTPUT_DIRECTORY")
-    else:
-        output_directory = ""
+    output_directory = os.getenv("OUTPUT_DIRECTORY") or params['output_directory']
+
+    anime_title = file_name.split(" --- ")[0].split(" - S")[0]  # TODO - do this differently lol
 
+    # TODO - fix on menu
     file_path = os.path.join(
-        params['output_directory'],
-        output_directory if output_directory else "",
-        file_name
-    ).replace(" --- ", "/", 1)
+        output_directory,
+        anime_title,
+        f"{file_name} ({get_language_from_key(int(params['language']))}).mp4"
+    )
 
     if not params['only_command']:
         msg = f"Downloading to '{file_path}'"