diff --git a/src/mpris.rs b/src/mpris.rs
index 4710cda..d369be9 100644
--- a/src/mpris.rs
+++ b/src/mpris.rs
@@ -32,15 +32,20 @@ fn get_metadata(track: Option<Track>) -> Metadata {
         "mpris:trackid".to_string(),
         Variant(Box::new(
             track
-                .map(|t| format!("spotify:track:{}", t.id.clone().unwrap_or("0".to_string())))
+                .map(|t| {
+                    format!(
+                        "spotify:track:{}",
+                        t.id.clone().unwrap_or_else(|| "0".to_string())
+                    )
+                })
                 .unwrap_or_default(),
         )),
     );
     hm.insert(
         "mpris:length".to_string(),
-        Variant(Box::new(
-            track.map(|t| t.duration * 1_000).unwrap_or(0) as i64
-        )),
+        Variant(Box::new(i64::from(
+            track.map(|t| t.duration * 1_000).unwrap_or(0),
+        ))),
     );
     hm.insert(
         "mpris:artUrl".to_string(),
diff --git a/src/spotify.rs b/src/spotify.rs
index 8d88e6e..121f63f 100644
--- a/src/spotify.rs
+++ b/src/spotify.rs
@@ -430,7 +430,9 @@ impl Spotify {
             None
         };
 
-        if let Some(()) = self.api_with_retry(|api| api.user_playlist_replace_tracks(&self.user, id, &tracks)) {
+        if let Some(()) =
+            self.api_with_retry(|api| api.user_playlist_replace_tracks(&self.user, id, &tracks))
+        {
             debug!("saved {} tracks to playlist {}", tracks.len(), id);
             while let Some(ref mut tracks) = remainder.clone() {
                 // grab the next set of 100 tracks
@@ -445,7 +447,6 @@ impl Spotify {
                     api.user_playlist_add_tracks(&self.user, id, &tracks, None)
                 });
 
-
                 if result.is_some() {
                     debug!("{} tracks successfully added", tracks.len());
                 } else {
@@ -453,8 +454,7 @@ impl Spotify {
                     return;
                 }
             }
-        }
-        else {
+        } else {
             error!("error saving tracks to playlist {}", id);
         }
     }