diff --git a/zone/gm_commands/resetaa.cpp b/zone/gm_commands/resetaa.cpp
index c0a9a075d..bac9892ff 100755
--- a/zone/gm_commands/resetaa.cpp
+++ b/zone/gm_commands/resetaa.cpp
@@ -7,15 +7,14 @@ void command_resetaa(Client *c, const Seperator *sep)
 		return;
 	}
 
-	auto target = c->GetTarget()->CastToClient();
-	target->ResetAA();
-		
+	auto t = c->GetTarget()->CastToClient();
+	t->ResetAA();
+
 	c->Message(
 		Chat::White,
 		fmt::format(
 			"Successfully reset all Alternate Advancements for {}.",
-			c->GetTargetDescription(target)
+			c->GetTargetDescription(t)
 		).c_str()
 	);
 }
-
diff --git a/zone/gm_commands/resetaa_timer.cpp b/zone/gm_commands/resetaa_timer.cpp
index bdc185e3a..766c76b06 100755
--- a/zone/gm_commands/resetaa_timer.cpp
+++ b/zone/gm_commands/resetaa_timer.cpp
@@ -2,43 +2,44 @@
 
 void command_resetaa_timer(Client *c, const Seperator *sep)
 {
-	int arguments = sep->argnum;
+	const auto arguments = sep->argnum;
 	if (!arguments) {
 		c->Message(Chat::White, "Usage: #resetaa_timer all - Reset all Alternate Advancement timers");
 		c->Message(Chat::White, "Usage: #resetaa_timer [Timer ID] - Reset Alternate Advancement timer by ID");
 		return;
 	}
 
-	auto target = c;
+	auto t = c;
 	if (c->GetTarget() && c->GetTarget()->IsClient()) {
-		target = c->GetTarget()->CastToClient();
+		t = c->GetTarget()->CastToClient();
 	}
 
-	bool is_all = !strcasecmp(sep->arg[1], "all");
+	const bool is_all = !strcasecmp(sep->arg[1], "all");
 
 	if (is_all) {
 		c->Message(
 			Chat::White,
 			fmt::format(
 				"Reset all Alternate Advancement timers for {}.",
-				c->GetTargetDescription(target)
+				c->GetTargetDescription(t)
 			).c_str()
 		);
-		target->ResetAlternateAdvancementTimers();
-		return;
-	}
 
-	if (sep->IsNumber(1)) {
-		int timer_id = Strings::ToInt(sep->arg[1]);
+		t->ResetAlternateAdvancementTimers();
+
+		return;
+	} else if (sep->IsNumber(1)) {
+		const auto timer_id = Strings::ToInt(sep->arg[1]);
+
 		c->Message(
 			Chat::White,
 			fmt::format(
 				"Reset Alternate Advancement timer {} for {}.",
 				timer_id,
-				c->GetTargetDescription(target)
+				c->GetTargetDescription(t)
 			).c_str()
 		);
-		target->ResetAlternateAdvancementTimer(timer_id);
+
+		t->ResetAlternateAdvancementTimer(timer_id);
 	}
 }
-