diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs
index 1cbcc2b3..f1b41805 100644
--- a/connect/src/spirc.rs
+++ b/connect/src/spirc.rs
@@ -337,7 +337,7 @@ impl Future for SpircTask {
                         error!("subscription terminated");
                         self.shutdown = true;
                         self.commands.close();
-                    },
+                    }
                     Async::NotReady => (),
                 }
 
diff --git a/core/src/session.rs b/core/src/session.rs
index 53e7a2d5..4d86a02b 100644
--- a/core/src/session.rs
+++ b/core/src/session.rs
@@ -296,7 +296,7 @@ where
                     warn!("Connection to server closed.");
                     session.shutdown();
                     return Ok(Async::Ready(()));
-                },
+                }
                 Ok(Async::NotReady) => return Ok(Async::NotReady),
                 Err(e) => {
                     session.shutdown();
diff --git a/playback/src/player.rs b/playback/src/player.rs
index 3f7152b4..38ee00c1 100644
--- a/playback/src/player.rs
+++ b/playback/src/player.rs
@@ -636,13 +636,12 @@ impl PlayerInternal {
         spotify_id: SpotifyId,
         position: i64,
     ) -> Option<(Decoder, f32, StreamLoaderController, usize)> {
-
         let audio = match AudioItem::get_audio_item(&self.session, spotify_id).wait() {
             Ok(audio) => audio,
             Err(_) => {
                 error!("Unable to load audio item.");
-                return None
-            },
+                return None;
+            }
         };
 
         info!("Loading <{}> with Spotify URI <{}>", audio.name, audio.uri);
diff --git a/src/main.rs b/src/main.rs
index 36a3ff44..9f41f2cd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,10 +8,10 @@ use std::mem;
 use std::path::PathBuf;
 use std::process::exit;
 use std::str::FromStr;
+use std::time::Instant;
 use tokio_core::reactor::{Core, Handle};
 use tokio_io::IoStream;
 use url::Url;
-use std::time::Instant;
 
 use librespot::core::authentication::{get_credentials, Credentials};
 use librespot::core::cache::Cache;
@@ -513,7 +513,9 @@ impl Future for Main {
             }
             if drop_spirc_and_try_to_reconnect {
                 self.spirc_task = None;
-                while (!self.auto_connect_times.is_empty()) && ((Instant::now() - self.auto_connect_times[0]).as_secs() > 600) {
+                while (!self.auto_connect_times.is_empty())
+                    && ((Instant::now() - self.auto_connect_times[0]).as_secs() > 600)
+                {
                     let _ = self.auto_connect_times.remove(0);
                 }
 
@@ -527,7 +529,6 @@ impl Future for Main {
                 }
             }
 
-
             if let Some(ref mut player_event_channel) = self.player_event_channel {
                 if let Async::Ready(Some(event)) = player_event_channel.poll().unwrap() {
                     if let Some(ref program) = self.player_event_program {