diff --git a/src/access_level.rs b/src/access_level.rs
index 2dc4f15..c41d81f 100644
--- a/src/access_level.rs
+++ b/src/access_level.rs
@@ -20,23 +20,23 @@ impl Default for AccessLevel {
 }
 
 pub fn default_level() -> AccessLevel {
-    return AccessLevel {
+    AccessLevel {
         id: -1,
         level: String::from("Public"),
         song_id: -1,
-    };
+    }
 }
 
 pub fn private_level() -> AccessLevel {
-    return AccessLevel {
+    AccessLevel {
         id: -1,
         level: String::from("Private"),
         song_id: -1,
-    };
+    }
 }
 
 impl AccessLevel {
     pub fn _to_json(&self) -> Result<String, serde_json::Error> {
-        return serde_json::to_string_pretty(&self);
+        serde_json::to_string_pretty(&self)
     }
 }
diff --git a/src/coverart.rs b/src/coverart.rs
index 4703823..f8aaec5 100644
--- a/src/coverart.rs
+++ b/src/coverart.rs
@@ -16,12 +16,8 @@ impl CoverArt {
         let mut file = std::fs::File::open(path)?;
         let mut buffer = Vec::new();
         match file.read_to_end(&mut buffer) {
-            Ok(_) => {
-                return Ok(buffer);
-            }
-            Err(err) => {
-                return Err(err);
-            }
+            Ok(_) => Ok(buffer),
+            Err(err) => Err(err),
         }
     }
 }
diff --git a/src/login_result.rs b/src/login_result.rs
index 9095fdb..782ca77 100644
--- a/src/login_result.rs
+++ b/src/login_result.rs
@@ -26,6 +26,6 @@ impl Default for LoginResult {
 
 impl LoginResult {
     pub fn _to_json(&self) -> Result<String, serde_json::Error> {
-        return serde_json::to_string_pretty(&self);
+        serde_json::to_string_pretty(&self)
     }
 }
diff --git a/src/song.rs b/src/song.rs
index 2e29a64..64650ab 100644
--- a/src/song.rs
+++ b/src/song.rs
@@ -96,18 +96,18 @@ impl Default for Song {
 impl Song {
     pub fn to_metadata_json(&self, pretty: bool) -> Result<String, serde_json::Error> {
         if pretty {
-            return serde_json::to_string_pretty(&self);
+            serde_json::to_string_pretty(&self)
         } else {
-            return serde_json::to_string(&self);
+            serde_json::to_string(&self)
         }
     }
 
     pub fn song_path(&self) -> Result<String, std::io::Error> {
         if self.directory.is_empty() {
-            return Err(std::io::Error::new(
+            Err(std::io::Error::new(
                 std::io::ErrorKind::Other,
                 "Directory does not exist",
-            ));
+            ))
         }
 
         let directory = &self.directory;
@@ -121,12 +121,12 @@ impl Song {
 
             buffer += &self.filename.clone();
 
-            return Ok(buffer);
+            Ok(buffer)
         } else {
-            return Err(std::io::Error::new(
+            Err(std::io::Error::new(
                 std::io::ErrorKind::Other,
                 "Could not access last character of directory",
-            ));
+            ))
         }
     }
 
@@ -140,17 +140,15 @@ impl Song {
                 file.read_to_end(&mut buffer)?;
 
                 if buffer.len() == 0 {
-                    return Err(std::io::Error::new(
+                    Err(std::io::Error::new(
                         std::io::ErrorKind::Other,
                         "File is empty",
-                    ));
+                    ))
                 } else {
-                    return Ok(buffer);
+                    Ok(buffer)
                 }
             }
-            Err(er) => {
-                return Err(er);
-            }
+            Err(er) => Err(er),
         }
     }