diff --git a/src/commands/archive.rs b/src/commands/archive.rs
index 4f2d5f1..06c720d 100644
--- a/src/commands/archive.rs
+++ b/src/commands/archive.rs
@@ -60,7 +60,7 @@ impl<'a> Command<'a> for ArchiveCommand {
         };
 
         if let Some(re) = args.grep {
-            entries.retain(|e| re.is_match(&e.note.clone().unwrap_or_else(String::new)));
+            entries.retain(|e| re.is_match(&e.note.clone().unwrap_or_default()));
         }
 
         if args.fake {
diff --git a/src/commands/display.rs b/src/commands/display.rs
index fa99ddb..6a7a6e9 100644
--- a/src/commands/display.rs
+++ b/src/commands/display.rs
@@ -66,7 +66,7 @@ where
     };
 
     if let Some(re) = grep {
-        entries.retain(|e| re.is_match(&e.note.clone().unwrap_or_else(String::new)));
+        entries.retain(|e| re.is_match(&e.note.clone().unwrap_or_default()));
     }
 
     let (entries, needs_warning) = entries_or_warning(entries, &streams.db)?;
diff --git a/src/config.rs b/src/config.rs
index 6e5f44b..98459ae 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -145,7 +145,7 @@ impl Config {
 
     pub fn write<P: AsRef<Path>>(&self, path: P) -> Result<String> {
         let path = path.as_ref();
-        let ext = path.extension().map(|e| e.to_str()).flatten();
+        let ext = path.extension().and_then(|e| e.to_str());
 
         let output = match ext {
             Some("toml") => {
diff --git a/src/formatters/ical.rs b/src/formatters/ical.rs
index aa46341..4448954 100644
--- a/src/formatters/ical.rs
+++ b/src/formatters/ical.rs
@@ -23,9 +23,9 @@ pub fn print_formatted<W: Write>(entries: Vec<Entry>, out: &mut W, now: DateTime
 
         writeln!(out, "BEGIN:VEVENT")?;
         writeln!(out, "DESCRIPTION:{note}", note=note)?;
-        writeln!(out, "DTEND:{end}", end=entry.end.unwrap_or(now).format(ICAL_TIME_FORMAT).to_string())?;
-        writeln!(out, "DTSTAMP:{start}", start=entry.start.format(ICAL_TIME_FORMAT).to_string())?;
-        writeln!(out, "DTSTART:{start}", start=entry.start.format(ICAL_TIME_FORMAT).to_string())?;
+        writeln!(out, "DTEND:{end}", end=entry.end.unwrap_or(now).format(ICAL_TIME_FORMAT))?;
+        writeln!(out, "DTSTAMP:{start}", start=entry.start.format(ICAL_TIME_FORMAT))?;
+        writeln!(out, "DTSTART:{start}", start=entry.start.format(ICAL_TIME_FORMAT))?;
         writeln!(out, "SEQUENCE:0")?;
         writeln!(out, "SUMMARY:{note}", note=note)?;
         writeln!(out, "UID:{uid}@{host}", uid=uid, host=host)?;