diff --git a/src/request.rs b/src/request.rs
index 3d8231c..461fbd0 100644
--- a/src/request.rs
+++ b/src/request.rs
@@ -16,7 +16,7 @@ impl Request {
     pub fn from(host: &str, port: u16, root: &str) -> Result<Request> {
         Ok(Request {
             host: host.into(),
-            port: port,
+            port,
             root: fs::canonicalize(root)?.to_string_lossy().into(),
             selector: String::new(),
             query: String::new(),
@@ -43,7 +43,7 @@ impl Request {
         self.query.clear();
         self.selector.clear();
         if let Some(i) = line.find('\t') {
-            if line.len() >= i + 1 {
+            if line.len() > i {
                 self.query.push_str(&line[i + 1..]);
                 self.selector.push_str(&line[..i]);
                 return;
diff --git a/src/server.rs b/src/server.rs
index a62b5e5..2e8d782 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -167,7 +167,7 @@ where
         )?;
     }
 
-    let mut footer = path.clone();
+    let mut footer = path;
     footer.push_str("/footer.gph");
     if fs_exists(&footer) {
         let mut sel = req.selector.clone();
@@ -251,7 +251,7 @@ fn gph_line_to_gopher(line: &str, req: &Request) -> String {
         return "".to_string();
     }
 
-    let mut line = line.trim_end_matches("\r").to_string();
+    let mut line = line.trim_end_matches('\r').to_string();
     if line.starts_with('[') && line.ends_with(']') && line.contains('|') {
         // [1|name|sel|server|port]
         let port = req.port.to_string();