diff --git a/src/audio/backend/gstreamer_backend.rs b/src/audio/backend/gstreamer_backend.rs
index c0c0745c9f9bd59ce7b4d6edf856ad177b680654..ce8701a075d54d163b9e64fe7eb92a3e2d640a62 100644
--- a/src/audio/backend/gstreamer_backend.rs
+++ b/src/audio/backend/gstreamer_backend.rs
@@ -481,15 +481,13 @@ impl GstreamerBackend {
                             let _ = pipeline.set_state(State::Paused);
                         }
                     }
-                } else {
-                    if buffering_state.buffering {
-                        buffering_state.buffering = false;
-                        if buffering_state.is_live == Some(false) {
-                            debug!("Resuming pipeline because buffering finished");
-                            let _ = pipeline.set_state(State::Playing);
-                            if let Some((pad, probe_id)) = buffering_state.buffering_probe.take() {
-                                pad.remove_probe(probe_id);
-                            }
+                } else if buffering_state.buffering {
+                    buffering_state.buffering = false;
+                    if buffering_state.is_live == Some(false) {
+                        debug!("Resuming pipeline because buffering finished");
+                        let _ = pipeline.set_state(State::Playing);
+                        if let Some((pad, probe_id)) = buffering_state.buffering_probe.take() {
+                            pad.remove_probe(probe_id);
                         }
                     }
                 }
diff --git a/src/audio/controller/mini_controller.rs b/src/audio/controller/mini_controller.rs
index 828afb384654dddc92dc5db55068b47d35654c86..8f29d69cd5b00f8324e06edc762b598d483f3b2f 100644
--- a/src/audio/controller/mini_controller.rs
+++ b/src/audio/controller/mini_controller.rs
@@ -94,7 +94,7 @@ impl Controller for MiniController {
     fn set_station(&self, station: Station) {
         self.title_label.set_text(&station.name);
         self.title_label.set_tooltip_text(Some(station.name.as_str()));
-        *self.station.borrow_mut() = Some(station.clone());
+        *self.station.borrow_mut() = Some(station);
 
         self.subtitle_revealer.set_reveal_child(false);
     }
diff --git a/src/audio/controller/mpris_controller.rs b/src/audio/controller/mpris_controller.rs
index 9bac4e07d692d553215bdb8fee84c17878d2e448..20c2ece26f473c635266d9d101bf858a81ed844b 100644
--- a/src/audio/controller/mpris_controller.rs
+++ b/src/audio/controller/mpris_controller.rs
@@ -144,7 +144,7 @@ impl Controller for MprisController {
 
     fn set_volume(&self, volume: f64) {
         *self.volume.borrow_mut() = volume;
-        self.mpris.set_volume(volume.clone()).unwrap();
+        self.mpris.set_volume(volume).unwrap();
     }
 
     fn set_song_title(&self, title: &str) {
diff --git a/src/audio/player.rs b/src/audio/player.rs
index a0efd524f0a1a6f1fefd3926200dd825c96fde17..9cea6e15b54e139022d24faa5e30b4a64fe651cf 100644
--- a/src/audio/player.rs
+++ b/src/audio/player.rs
@@ -221,7 +221,7 @@ impl Player {
 
     pub fn set_volume(&self, volume: f64) {
         debug!("Set volume: {}", &volume);
-        self.backend.lock().unwrap().gstreamer.set_volume(volume.clone());
+        self.backend.lock().unwrap().gstreamer.set_volume(volume);
 
         for con in &*self.controller {
             con.set_volume(volume);
diff --git a/src/ui/song_listbox.rs b/src/ui/song_listbox.rs
index 391321165bada205b4816c6810bb68d7343616e3..573d263a5e8831ba859717bb1fca986714050354 100644
--- a/src/ui/song_listbox.rs
+++ b/src/ui/song_listbox.rs
@@ -16,7 +16,6 @@
 
 use glib::Sender;
 use gtk::prelude::*;
-use open;
 
 use crate::app::Action;
 use crate::audio::Song;
diff --git a/src/ui/song_row.rs b/src/ui/song_row.rs
index b492cf2dea7acb9126d189ed8de38bffdca677a2..797ac403b2f200c7320c0b0905c29b41f4313b29 100644
--- a/src/ui/song_row.rs
+++ b/src/ui/song_row.rs
@@ -17,7 +17,6 @@
 use chrono::NaiveTime;
 use glib::Sender;
 use gtk::prelude::*;
-use open;
 
 use crate::app::Action;
 use crate::audio::Song;
diff --git a/src/ui/window.rs b/src/ui/window.rs
index 5086b399b09967d6c95d1112273da72a5eacfb62..5d03a02068b1d44c401fceae7fd398e80809ab14 100644
--- a/src/ui/window.rs
+++ b/src/ui/window.rs
@@ -108,7 +108,7 @@ impl SwApplicationWindow {
         // Create new GObject and downcast it into SwApplicationWindow
         let window = glib::Object::new(SwApplicationWindow::static_type(), &[]).unwrap().downcast::<SwApplicationWindow>().unwrap();
 
-        app.add_window(&window.clone());
+        app.add_window(&window);
         window.setup_widgets();
         window.setup_signals(sender.clone());
         window.setup_gactions(sender);
@@ -372,12 +372,10 @@ impl SwApplicationWindow {
         // and set the corresponding view (Library|Storefront|Player)
         let current_view = if self_.sidebar_flap.get_folded() && self_.sidebar_flap.get_reveal_flap() {
             View::Player
+        } else if deck_child_name == "storefront" {
+            View::Storefront
         } else {
-            if deck_child_name == "storefront" {
-                View::Storefront
-            } else {
-                View::Library
-            }
+            View::Library
         };
 
         // Show bottom player controller toolbar when sidebar flap is folded and player widget is not revealed