diff --git a/src/cli/cli.rs b/src/cli/cli.rs
index 363fa59530263e2f0b6809bf267ba23afe6e74eb..f2272d2e0012db5ced535db6f556b78ff3f9079a 100644
--- a/src/cli/cli.rs
+++ b/src/cli/cli.rs
@@ -22,7 +22,7 @@ Web Server Options:
     -c=<path>, --config=<path>       Path to the .swerve config file
     -t=<num>, --threads=<num>        Number of worker threads to use for serving files; defaults to 32
 
-Data Handling Options
+Data Handling Options:
     -u, --upload                     Support file uploads to '/upload'
     -U=<path>, --upload-path=<path>  Set the url path that will accept file uploads. Implies 'upload' flag if not present
 
@@ -60,11 +60,11 @@ impl Args {
 impl Default for Args {
 	fn default() -> Self {
 		Args {
-			flag_dir: Some(""),
+			flag_dir: Some(String::from("")),
 			flag_port: Some(8000),
 			flag_config: None,
 			flag_threads: Some(32),
-			flag_address: Some("localhost"),
+			flag_address: Some(String::from("localhost")),
 			flag_help: false,
 			flag_quiet: false,
 			flag_no_index: false,
diff --git a/src/cli/config_file.rs b/src/cli/config_file.rs
index 09e088fa23f7569ed865d94b76c33758726a02f5..7723ae5209ec491e3939a6f9b0c46116881003be 100644
--- a/src/cli/config_file.rs
+++ b/src/cli/config_file.rs
@@ -3,9 +3,8 @@ use std::convert::AsRef;
 use std::io::prelude::*;
 use std::io;
 use std::fs::File;
-use std::io::BufReader;
 use std::default::Default;
-use serde::{Deserialize, Deserializer, de::{self, Error}};
+use serde::{Deserialize, Deserializer, de};
 use std::fmt;
 use serde_yaml as yaml;