diff --git a/src/main.rs b/src/main.rs
index 1e25ec4..88c20d9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -343,16 +343,12 @@ async fn prep_song(
                 Ok(song_bytes) => {
                     let (directory, filename) = generate_song_queue_dir_and_filename().await;
                     let song = icarus_models::song::Song {
-                        directory: directory,
-                        filename: filename,
+                        directory,
+                        filename,
                         data: song_bytes,
                         ..Default::default()
                     };
-                    let songpath = match song.song_path() {
-                        Ok(songpath) => songpath,
-                        Err(_err) => String::new(),
-                    };
-
+                    let songpath = song.song_path().unwrap_or_default();
                     let song_queue_path = match song.save_to_filesystem() {
                         Ok(_) => std::path::Path::new(&songpath),
                         Err(_err) => std::path::Path::new(""),
@@ -395,8 +391,8 @@ async fn prep_song(
                                                                 let coverart_queue_path = std::path::Path::new(&coverart.path);
                                                                 println!("Saved coverart queue file at: {coverart_queue_path:?}");
 
-                                                                let c_path = util::path_buf_to_string(&coverart_queue_path);
-                                                                let s_path = util::path_buf_to_string(&song_queue_path);
+                                                                let c_path = util::path_buf_to_string(coverart_queue_path);
+                                                                let s_path = util::path_buf_to_string(song_queue_path);
                                                                 Ok((s_path, c_path, metadata.clone(), *coverart_queue_id))
                                                             }
                                                             Err(err) => {