diff --git a/src/errors.rs b/src/errors.rs
index a6d77de..f6fc60a 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -73,8 +73,8 @@ where
     E: CompilerError + Debug,
 {
     let mut chars = 0;
-    let mut lines = source.split_inclusive('\n').enumerate();
-    while let Some((idx, line)) = lines.next() {
+    let lines = source.split_inclusive('\n').enumerate();
+    for (idx, line) in lines {
         if chars + line.len() + 1 > error.span().start {
             let offset_on_line = error.span().start - chars;
 
diff --git a/src/lex.rs b/src/lex.rs
index 6337057..40e3c30 100644
--- a/src/lex.rs
+++ b/src/lex.rs
@@ -373,7 +373,7 @@ impl CompilerError for LexError {
     fn message(&self) -> String {
         match &self.kind {
             LexErrorKind::InvalidCharacter(char) => format!("Unexpected character: '{}'", char),
-            LexErrorKind::InvalidFloat(_) => format!("Invalid number"),
+            LexErrorKind::InvalidFloat(_) => "Invalid number".to_string(),
             LexErrorKind::FloatInfiniteLiteral => "Number literal too long".to_string(),
             LexErrorKind::UnclosedStringLiteral => "String literal not closed".to_string(),
             LexErrorKind::SingleBang => "Expected '=' after '!'".to_string(),
diff --git a/src/main.rs b/src/main.rs
index f527586..554a470 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,5 @@
 fn main() {
-    if let Some(filename) = std::env::args().skip(1).next() {
+    if let Some(filename) = std::env::args().nth(1) {
         match std::fs::read_to_string(filename) {
             Ok(contents) => {
                 script_lang::run_program(&contents);
diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index 84fb5a1..77ab4c3 100644
--- a/src/parse/mod.rs
+++ b/src/parse/mod.rs
@@ -65,15 +65,15 @@ impl<'code> Parser<'code> {
     }
 
     fn statement(&mut self) -> ParseResult<'code, Stmt> {
-        match self.peek_kind().ok_or(ParseErr::EOF("statement"))? {
-            &TokenType::Let => self.declaration(),
-            &TokenType::Fn => self.fn_decl(),
-            &TokenType::If => Ok(Stmt::If(self.if_stmt()?)),
-            &TokenType::Loop => self.loop_stmt(),
-            &TokenType::While => self.while_stmt(),
-            &TokenType::Break => self.break_stmt(),
-            &TokenType::Return => self.return_stmt(),
-            &TokenType::BraceO => Ok(Stmt::Block(self.block()?)),
+        match *self.peek_kind().ok_or(ParseErr::Eof("statement"))? {
+            TokenType::Let => self.declaration(),
+            TokenType::Fn => self.fn_decl(),
+            TokenType::If => Ok(Stmt::If(self.if_stmt()?)),
+            TokenType::Loop => self.loop_stmt(),
+            TokenType::While => self.while_stmt(),
+            TokenType::Break => self.break_stmt(),
+            TokenType::Return => self.return_stmt(),
+            TokenType::BraceO => Ok(Stmt::Block(self.block()?)),
             _ => {
                 let expr = self.expression()?;
                 self.expect(TokenType::Semi)?;
@@ -307,7 +307,7 @@ impl<'code> Parser<'code> {
     }
 
     fn primary<'parser>(&'parser mut self) -> ParseResult<'code, Expr> {
-        let next = self.next().ok_or(ParseErr::EOF("primary"))?;
+        let next = self.next().ok_or(ParseErr::Eof("primary"))?;
         match next.kind {
             TokenType::String(literal) => Ok(Expr::Literal(Literal::String(literal, next.span))),
             TokenType::Number(literal) => Ok(Expr::Literal(Literal::Number(literal, next.span))),
@@ -333,7 +333,7 @@ impl<'code> Parser<'code> {
     }
 
     fn ident(&mut self) -> ParseResult<'code, Ident> {
-        let Token { kind, span } = self.next().ok_or(ParseErr::EOF("identifier"))?;
+        let Token { kind, span } = self.next().ok_or(ParseErr::Eof("identifier"))?;
         match kind {
             TokenType::Ident(name) => {
                 let name_owned = name.to_owned();
@@ -384,7 +384,7 @@ impl<'code> Parser<'code> {
 
         while self
             .peek_kind()
-            .ok_or_else(|| ParseErr::EOFExpecting(close.clone()))?
+            .ok_or_else(|| ParseErr::EofExpecting(close.clone()))?
             != &close
         {
             self.expect(TokenType::Comma)?;
@@ -428,7 +428,7 @@ impl<'code> Parser<'code> {
                 })
             }
         } else {
-            Err(ParseErr::EOFExpecting(kind))
+            Err(ParseErr::EofExpecting(kind))
         }
     }
 }
@@ -442,8 +442,8 @@ pub enum ParseErr<'code> {
         actual: Token<'code>,
     },
     InvalidTokenPrimary(Token<'code>),
-    EOFExpecting(TokenType<'code>),
-    EOF(&'static str),
+    EofExpecting(TokenType<'code>),
+    Eof(&'static str),
 }
 
 impl CompilerError for ParseErr<'_> {
@@ -454,8 +454,8 @@ impl CompilerError for ParseErr<'_> {
                 ..
             } => *span,
             ParseErr::InvalidTokenPrimary(Token { span, .. }) => *span,
-            ParseErr::EOFExpecting(_) => Span::dummy(),
-            ParseErr::EOF(_) => Span::dummy(),
+            ParseErr::EofExpecting(_) => Span::dummy(),
+            ParseErr::Eof(_) => Span::dummy(),
             ParseErr::BreakOutsideLoop(span) => *span,
             ParseErr::ReturnOutsideFunction(span) => *span,
         }
@@ -469,10 +469,10 @@ impl CompilerError for ParseErr<'_> {
             ParseErr::InvalidTokenPrimary(token) => {
                 format!("invalid token in expression: `{:?}`", token.kind)
             }
-            ParseErr::EOFExpecting(token) => {
+            ParseErr::EofExpecting(token) => {
                 format!("reached EOF searching for `{:?}`", token)
             }
-            ParseErr::EOF(message) => {
+            ParseErr::Eof(message) => {
                 format!("reached EOF while parsing `{}`", message)
             }
             ParseErr::BreakOutsideLoop(_) => "break used outside of loop".to_string(),