diff --git a/src/gcsf/drive_facade.rs b/src/gcsf/drive_facade.rs
index 92f7906..db9b383 100644
--- a/src/gcsf/drive_facade.rs
+++ b/src/gcsf/drive_facade.rs
@@ -236,12 +236,10 @@ impl DriveFacade {
             .next()
             .ok_or(err_msg(
                 "No files on drive. Can't deduce drive id for 'My Drive'",
-            ))?
-            .parents
+            ))?.parents
             .ok_or(err_msg(
                 "Probed file has no parents. Can't deduce drive id for 'My Drive'",
-            ))?
-            .into_iter()
+            ))?.into_iter()
             .take(1)
             .next()
             .ok_or(err_msg(
diff --git a/src/gcsf/file.rs b/src/gcsf/file.rs
index f8ae556..fc46dea 100644
--- a/src/gcsf/file.rs
+++ b/src/gcsf/file.rs
@@ -70,16 +70,15 @@ impl File {
             &drive_file.modified_time,
             &drive_file.viewed_by_me_time,
         ].iter()
-            .map(|time| {
-                match DateTime::parse_from_rfc3339(time.as_ref().unwrap_or(&String::new())) {
-                    Ok(t) => Timespec {
-                        sec: t.timestamp(),
-                        nsec: t.timestamp_subsec_nanos() as i32,
-                    },
-                    Err(_) => Timespec { sec: 0, nsec: 0 },
-                }
-            })
-            .collect();
+        .map(
+            |time| match DateTime::parse_from_rfc3339(time.as_ref().unwrap_or(&String::new())) {
+                Ok(t) => Timespec {
+                    sec: t.timestamp(),
+                    nsec: t.timestamp_subsec_nanos() as i32,
+                },
+                Err(_) => Timespec { sec: 0, nsec: 0 },
+            },
+        ).collect();
 
         let (crtime, mtime, atime) = (times[0], times[1], times[2]);
         let bsize = 512;
@@ -146,7 +145,8 @@ impl File {
         self.drive_file
             .as_ref()
             .and_then(|f| f.mime_type.clone())
-            .map(|t| EXTENSIONS.contains_key::<str>(&t)) == Some(true)
+            .map(|t| EXTENSIONS.contains_key::<str>(&t))
+            == Some(true)
     }
 
     pub fn name(&self) -> String {
diff --git a/src/gcsf/file_manager.rs b/src/gcsf/file_manager.rs
index ed4297b..3db86f2 100644
--- a/src/gcsf/file_manager.rs
+++ b/src/gcsf/file_manager.rs
@@ -365,8 +365,7 @@ impl FileManager {
                     .get_children(&id)
                     .ok_or(err_msg(
                         "FileManager::add_file_locally() could not get file siblings",
-                    ))?
-                    .iter()
+                    ))?.iter()
                     .filter(|child| child.name == file.name)
                     .count();
 
@@ -488,7 +487,9 @@ impl FileManager {
                 .filter(|child| child.name == new_name)
                 .count();
 
-            let file = self.get_mut_file(&id).ok_or(err_msg("File doesn't exist"))?;
+            let file = self
+                .get_mut_file(&id)
+                .ok_or(err_msg("File doesn't exist"))?;
             file.name = new_name.clone();
 
             if identical_filename_count > 0 {
diff --git a/src/gcsf/filesystem.rs b/src/gcsf/filesystem.rs
index f55807d..423adeb 100644
--- a/src/gcsf/filesystem.rs
+++ b/src/gcsf/filesystem.rs
@@ -99,8 +99,7 @@ impl Filesystem for GCSF {
                 let id = f.drive_id().unwrap();
 
                 (mime, id)
-            })
-            .unwrap();
+            }).unwrap();
 
         reply.data(
             self.manager