diff --git a/monstercat_dl.cpp b/monstercat_dl.cpp
index de5980d..6386395 100644
--- a/monstercat_dl.cpp
+++ b/monstercat_dl.cpp
@@ -344,17 +344,16 @@ string Monstercat_DL::calc_release_folder(const Release& release, const string&
 {
 	string result;
 	string folder_name;
-	string temp;
 
 	ensure_folder(main_folder, release.type);
 
 	folder_name = release.release_date;
 	folder_name += " - ";
-	folder_name += release.catalog_id;
+	folder_name += clean_filename(release.catalog_id);
 	folder_name += " - ";
-	folder_name += release.artist;
+	folder_name += clean_filename(release.artist);
 	folder_name += " - ";
-	folder_name += release.title;
+	folder_name += clean_filename(release.title);
 
 	result = build_fname(main_folder, release.type, folder_name);
 	ensure_folder(result, "");
@@ -426,7 +425,7 @@ string Monstercat_DL::calc_track_filename(const Release& release, int track_num)
 
 	result += track->title;
 
-	return result;
+	return clean_filename(result);
 }
 
 bool Monstercat_DL::download_cover(const string& catalog_id, const string& path)