diff --git a/src/album.py b/src/album.py
index 12f86eb..d797d02 100644
--- a/src/album.py
+++ b/src/album.py
@@ -28,7 +28,7 @@ def get_album_tracks(album_id):
 def get_album_name(album_id):
     """ Returns album name """
     resp = ZSpotify.invoke_url(f'{ALBUM_URL}/{album_id}')
-    return resp[ARTISTS][0][NAME], sanitize_data(resp[NAME])
+    return sanitize_data(resp[ARTISTS][0][NAME]), sanitize_data(resp[NAME])
 
 
 def get_artist_albums(artist_id):
diff --git a/src/track.py b/src/track.py
index 26ad635..d9109b6 100644
--- a/src/track.py
+++ b/src/track.py
@@ -37,9 +37,9 @@ def get_song_info(song_id) -> tuple[list[str], str, str, Any, Any, Any, Any, Any
 
     artists = []
     for data in info[TRACKS][0][ARTISTS]:
-        artists.append(sanitize_data(data[NAME]))
-    album_name = sanitize_data(info[TRACKS][0][ALBUM][NAME])
-    name = sanitize_data(info[TRACKS][0][NAME])
+        artists.append(data[NAME])
+    album_name = info[TRACKS][0][ALBUM][NAME]
+    name = info[TRACKS][0][NAME]
     image_url = info[TRACKS][0][ALBUM][IMAGES][0][URL]
     release_year = info[TRACKS][0][ALBUM][RELEASE_DATE].split('-')[0]
     disc_number = info[TRACKS][0][DISC_NUMBER]
@@ -57,7 +57,7 @@ def download_track(track_id: str, extra_paths='', prefix=False, prefix_value='',
         (artists, album_name, name, image_url, release_year, disc_number,
          track_number, scraped_song_id, is_playable) = get_song_info(track_id)
 
-        song_name = artists[0] + ' - ' + name
+        song_name = sanitize_data(artists[0]) + ' - ' + sanitize_data(name)
         if prefix:
             song_name = f'{prefix_value.zfill(2)} - {song_name}' if prefix_value.isdigit(
             ) else f'{prefix_value} - {song_name}'