diff --git a/README.md b/README.md
index b1a15de..399ec1f 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Separate folders if more than 1 track otherwise put in main folder.
 This is where extended mixes are put into. They are in their original format.
 
 ### File Naming
-* Artist - Title.(mp3/flac) - Used when only 1 track
+* Title.(mp3/flac) - Used when only 1 track
 
 * Number - Title.(mp3/flac) - Used when track artist **matches** release artist
 * Number - Artist - Title.(mp3/flac) - Used when track artist **does not match** release artist
diff --git a/monstercat_dl.cpp b/monstercat_dl.cpp
index cba075e..b50504c 100644
--- a/monstercat_dl.cpp
+++ b/monstercat_dl.cpp
@@ -389,23 +389,24 @@ string Monstercat_DL::calc_track_filename(const Release& release, int track_num)
 		return "";
 	}
 
-	// Determine what we need
+	// Determine whether number is needed
 	if (1 == release.tracks.size())
 	{
 		use_number = false;
-		use_artist = true;
 	}
 	else
 	{
 		use_number = true;
-		if (track->artist == release.artist)
-		{
-			use_artist = false;
-		}
-		else
-		{
-			use_artist = true;
-		}
+	}
+
+	// Determine whether artist is needed
+	if (track->artist == release.artist)
+	{
+		use_artist = false;
+	}
+	else
+	{
+		use_artist = true;
 	}
 
 	// Build filename