diff --git a/src/capsules/login_form.rs b/src/capsules/login_form.rs
index b127c1b..3dcfea0 100644
--- a/src/capsules/login_form.rs
+++ b/src/capsules/login_form.rs
@@ -95,7 +95,7 @@ fn login_form_capsule<G: Html>(
         #[cfg(client)]
         {
             spawn_local_scoped(cx, async move {
-                let remember_me = state.remember_me.get().as_ref().clone();
+                let remember_me = *state.remember_me.get().as_ref();
                 let username = state.username.get().as_ref().clone();
                 let login_info = LoginInfo {
                     username: username.clone(),
diff --git a/src/global_state.rs b/src/global_state.rs
index 104413f..8e91b48 100644
--- a/src/global_state.rs
+++ b/src/global_state.rs
@@ -47,7 +47,7 @@ impl AuthDataRx {
 
         // Save token to session storage
         self.username.set(Some(auth_info.username.clone()));
-        self.remember_me.set(Some(auth_info.remember_me.clone()));
+        self.remember_me.set(Some(auth_info.remember_me));
         self.auth_info.set(Some(auth_info));
         self.state.set(LoginState::Authenticated);
     }
diff --git a/src/server/auth/login.rs b/src/server/auth/login.rs
index a01ad96..908c7d7 100644
--- a/src/server/auth/login.rs
+++ b/src/server/auth/login.rs
@@ -99,11 +99,13 @@ pub async fn post_test_login(
             if auth_header_str.starts_with("Bearer ") {
                 let token = auth_header_str.trim_start_matches("Bearer ").to_string();
                 // @todo change secret
-                if let Ok(_) = decode::<Claims>(
+                if decode::<Claims>(
                     &token,
                     &DecodingKey::from_secret("secret".as_ref()),
                     &Validation::default(),
-                ) {
+                )
+                .is_ok()
+                {
                     return Ok(Json("Logged in".to_owned()));
                 }
             }
diff --git a/src/server/auth/register.rs b/src/server/auth/register.rs
index 5e808b0..d75f6de 100644
--- a/src/server/auth/register.rs
+++ b/src/server/auth/register.rs
@@ -51,7 +51,7 @@ pub async fn post_register_user(
         username: Set(username),
         password_hash_and_salt: Set(phc_string),
         nickname: Set({
-            if register_info.nickname == "" {
+            if register_info.nickname.is_empty() {
                 None
             } else {
                 Some(register_info.nickname)
@@ -61,7 +61,7 @@ pub async fn post_register_user(
         last_active_time: Set(Utc::now().naive_utc()),
         is_admin: Set(false),
         email: Set({
-            if register_info.email == "" {
+            if register_info.email.is_empty() {
                 None
             } else {
                 Some(register_info.email)
@@ -82,5 +82,5 @@ pub async fn post_register_user(
         }
     };
 
-    return (StatusCode::OK, Json(GenericResponse::ok()));
+    (StatusCode::OK, Json(GenericResponse::ok()))
 }
diff --git a/src/state_enums.rs b/src/state_enums.rs
index 3fa9e45..15d226a 100644
--- a/src/state_enums.rs
+++ b/src/state_enums.rs
@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone)]
@@ -15,14 +17,18 @@ pub enum GameState {
     TableTennis,
 }
 
-impl ToString for GameState {
-    fn to_string(&self) -> String {
-        match self {
-            GameState::None => String::new(),
-            GameState::Pool => "Pool".to_owned(),
-            GameState::Pickleball => "Pool".to_owned(),
-            GameState::TableTennis => "Pool".to_owned(),
-        }
+impl Display for GameState {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                GameState::None => "",
+                GameState::Pool => "Pool",
+                GameState::Pickleball => "Pickle Ball",
+                GameState::TableTennis => "Table Tennis",
+            }
+        )
     }
 }