diff --git a/src/lib.rs b/src/lib.rs
index 4aed55e..a006e31 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,80 +12,50 @@ mod meta_type {
 mod meta_nouveaou {
     use super::*;
 
-    use metadata;
-
     pub fn get_meta(t: meta_type::Type, filepath: &String) -> Result<String, std::io::Error> {
         match t {
-            meta_type::Type::Title => match new_meta(&filepath) {
+            meta_type::Type::Title => match new_meta(filepath) {
                 Ok(metaa) => match get_val(t, metaa.tags) {
-                    Ok(val) => {
-                        return Ok(val);
-                    }
-                    Err(err) => {
-                        return Err(err);
-                    }
+                    Ok(val) => Ok(val),
+                    Err(err) => Err(err),
                 },
                 Err(err) => Err(err),
             },
-            meta_type::Type::Artist => match new_meta(&filepath) {
+            meta_type::Type::Artist => match new_meta(filepath) {
                 Ok(metaa) => match get_val(t, metaa.tags) {
-                    Ok(val) => {
-                        return Ok(val);
-                    }
-                    Err(err) => {
-                        return Err(err);
-                    }
+                    Ok(val) => Ok(val),
+                    Err(err) => Err(err),
                 },
                 Err(err) => Err(err),
             },
-            meta_type::Type::Album => match new_meta(&filepath) {
+            meta_type::Type::Album => match new_meta(filepath) {
                 Ok(metaa) => match get_val(t, metaa.tags) {
-                    Ok(val) => {
-                        return Ok(val);
-                    }
-                    Err(err) => {
-                        return Err(err);
-                    }
+                    Ok(val) => Ok(val),
+                    Err(err) => Err(err),
                 },
                 Err(err) => Err(err),
             },
-            meta_type::Type::Genre => match new_meta(&filepath) {
+            meta_type::Type::Genre => match new_meta(filepath) {
                 Ok(metaa) => match get_val(t, metaa.tags) {
-                    Ok(val) => {
-                        return Ok(val);
-                    }
-                    Err(err) => {
-                        return Err(err);
-                    }
+                    Ok(val) => Ok(val),
+                    Err(err) => Err(err),
                 },
                 Err(err) => Err(err),
             },
-            meta_type::Type::Year => match new_meta(&filepath) {
+            meta_type::Type::Year => match new_meta(filepath) {
                 Ok(metaa) => match get_val(t, metaa.tags) {
-                    Ok(val) => {
-                        return Ok(val);
-                    }
-                    Err(err) => {
-                        return Err(err);
-                    }
+                    Ok(val) => Ok(val),
+                    Err(err) => Err(err),
                 },
                 Err(err) => Err(err),
             },
-            meta_type::Type::Track => match new_meta(&filepath) {
+            meta_type::Type::Track => match new_meta(filepath) {
                 Ok(metaa) => match get_val(t, metaa.tags) {
-                    Ok(val) => {
-                        return Ok(val);
-                    }
-                    Err(err) => {
-                        return Err(err);
-                    }
+                    Ok(val) => Ok(val),
+                    Err(err) => Err(err),
                 },
                 Err(err) => Err(err),
             },
-            _ => Err(std::io::Error::new(
-                std::io::ErrorKind::InvalidInput,
-                "Invalid",
-            )),
         }
     }
 
@@ -100,10 +70,7 @@ mod meta_nouveaou {
         }
     }
 
-    fn get_val(
-        t: meta_type::Type,
-        tags: Vec<((String, String))>,
-    ) -> Result<String, std::io::Error> {
+    fn get_val(t: meta_type::Type, tags: Vec<(String, String)>) -> Result<String, std::io::Error> {
         let type_ma: String = get_type(t).unwrap();
         for tag in tags {
             if tag.0 == type_ma {
@@ -111,10 +78,10 @@ mod meta_nouveaou {
             }
         }
 
-        return Err(std::io::Error::new(
+        Err(std::io::Error::new(
             std::io::ErrorKind::InvalidInput,
             "Invalid",
-        ));
+        ))
     }
 
     fn new_meta(filepath: &String) -> Result<metadata::MediaFileMetadata, std::io::Error> {