Code Review

These should be in `let` blocks not just randomly hanging out :monkey: