diff --git a/common/rulesys.cpp b/common/rulesys.cpp
index 82d471745..3ce748fb9 100644
--- a/common/rulesys.cpp
+++ b/common/rulesys.cpp
@@ -236,46 +236,51 @@ void RuleManager::SaveRules(Database *database, const char *ruleset_name) {
 }
 
 bool RuleManager::LoadRules(Database *database, const char *ruleset_name) {
-	
-	int ruleset_id = GetRulesetID(database, ruleset_name);
+
+	int ruleset_id = this->GetRulesetID(database, ruleset_name);
 	if (ruleset_id < 0) {
 		Log(Logs::Detail, Logs::Rules, "Failed to find ruleset '%s' for load operation. Canceling.", ruleset_name);
-		return(false);
+		return (false);
 	}
 
 	Log(Logs::Detail, Logs::Rules, "Loading rule set '%s' (%d)", ruleset_name, ruleset_id);
 
 	m_activeRuleset = ruleset_id;
-	m_activeName = ruleset_name;
+	m_activeName    = ruleset_name;
 
 	/* Load default ruleset values first if we're loading something other than default */
-	if (strcasecmp(ruleset_name, "default") != 0){
+	if (strcasecmp(ruleset_name, "default") != 0) {
 		std::string default_ruleset_name = "default";
-		int default_ruleset_id = GetRulesetID(database, default_ruleset_name.c_str());
+		int         default_ruleset_id   = GetRulesetID(database, default_ruleset_name.c_str());
 		if (default_ruleset_id < 0) {
-			Log(Logs::Detail, Logs::Rules, "Failed to find default ruleset '%s' for load operation. Canceling.", default_ruleset_name.c_str());
-			return(false);
+			Log(Logs::Detail, Logs::Rules, "Failed to find default ruleset '%s' for load operation. Canceling.",
+			    default_ruleset_name.c_str());
+			return (false);
 		}
 		Log(Logs::Detail, Logs::Rules, "Loading rule set '%s' (%d)", default_ruleset_name.c_str(), default_ruleset_id);
 
-		std::string query = StringFormat("SELECT rule_name, rule_value FROM rule_values WHERE ruleset_id = %d", default_ruleset_id);
+		std::string query = StringFormat(
+				"SELECT rule_name, rule_value FROM rule_values WHERE ruleset_id = %d",
+				default_ruleset_id
+		);
+
 		auto results = database->QueryDatabase(query);
 		if (!results.Success())
 			return false;
 
 		for (auto row = results.begin(); row != results.end(); ++row)
-		if (!SetRule(row[0], row[1], nullptr, false))
-			Log(Logs::Detail, Logs::Rules, "Unable to interpret rule record for %s", row[0]);
+			if (!SetRule(row[0], row[1], nullptr, false))
+				Log(Logs::Detail, Logs::Rules, "Unable to interpret rule record for %s", row[0]);
 	}
 
-	std::string query = StringFormat("SELECT rule_name, rule_value FROM rule_values WHERE ruleset_id=%d", ruleset_id);
-	auto results = database->QueryDatabase(query);
+	std::string query   = StringFormat("SELECT rule_name, rule_value FROM rule_values WHERE ruleset_id=%d", ruleset_id);
+	auto        results = database->QueryDatabase(query);
 	if (!results.Success())
 		return false;
 
 	for (auto row = results.begin(); row != results.end(); ++row)
-	if (!SetRule(row[0], row[1], nullptr, false))
-		Log(Logs::Detail, Logs::Rules, "Unable to interpret rule record for %s", row[0]);
+		if (!SetRule(row[0], row[1], nullptr, false))
+			Log(Logs::Detail, Logs::Rules, "Unable to interpret rule record for %s", row[0]);
 
 	return true;
 }
@@ -283,7 +288,7 @@ bool RuleManager::LoadRules(Database *database, const char *ruleset_name) {
 void RuleManager::_SaveRule(Database *database, RuleType type, uint16 index) {
 	char value_string[100];
 
-	switch(type) {
+	switch (type) {
 		case IntRule:
 			sprintf(value_string, "%d", m_RuleIntValues[index]);
 			break;
@@ -291,22 +296,26 @@ void RuleManager::_SaveRule(Database *database, RuleType type, uint16 index) {
 			sprintf(value_string, "%.13f", m_RuleRealValues[index]);
 			break;
 		case BoolRule:
-			sprintf(value_string, "%s", m_RuleBoolValues[index]?"true":"false");
+			sprintf(value_string, "%s", m_RuleBoolValues[index] ? "true" : "false");
 			break;
 	}
 
-	std::string query = StringFormat("REPLACE INTO rule_values "
-                                    "(ruleset_id, rule_name, rule_value) "
-                                    " VALUES(%d, '%s', '%s')",
-                                    m_activeRuleset, _GetRuleName(type, index), value_string);
-    auto results = database->QueryDatabase(query);
+	std::string query = StringFormat(
+			"REPLACE INTO rule_values "
+			"(ruleset_id, rule_name, rule_value) "
+			" VALUES(%d, '%s', '%s')",
+			m_activeRuleset,
+			_GetRuleName(type, index),
+			value_string
+	);
 
+	database->QueryDatabase(query);
 }
 
 
 int RuleManager::GetRulesetID(Database *database, const char *ruleset_name) {
 
-	uint32 len = strlen(ruleset_name);
+	uint32 len = static_cast<uint32>(strlen(ruleset_name));
 	auto rst = new char[2 * len + 1];
 	database->DoEscapeString(rst, ruleset_name, len);
 
diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp
index 7c60bffe0..7b5524605 100644
--- a/zone/worldserver.cpp
+++ b/zone/worldserver.cpp
@@ -1765,8 +1765,13 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-	case ServerOP_ReloadRules:
-	{
+	case ServerOP_ReloadRules: {
+		worldserver.SendEmoteMessage(
+				0, 0, 0, 15,
+				"Rules reloaded for Zone: '%s' Instance ID: %u",
+				zone->GetLongName(),
+				zone->GetInstanceID()
+		);
 		RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset());
 		break;
 	}