diff --git a/common/races.cpp b/common/races.cpp
index 331ee8e7e..68f4717b6 100644
--- a/common/races.cpp
+++ b/common/races.cpp
@@ -1349,102 +1349,99 @@ const char* GetPlayerRaceName(uint32 player_race_value)
 	return GetRaceIDName(GetRaceIDFromPlayerRaceValue(player_race_value));
 }
 
-uint32 GetPlayerRaceValue(uint16 race_id)
-{
+uint32 GetPlayerRaceValue(uint16 race_id) {
 	switch (race_id) {
-	case HUMAN:
-	case BARBARIAN:
-	case ERUDITE:
-	case WOOD_ELF:
-	case HIGH_ELF:
-	case DARK_ELF:
-	case HALF_ELF:
-	case DWARF:
-	case TROLL:
-	case OGRE:
-	case HALFLING:
-	case GNOME:
-		return race_id;
-	case IKSAR:
-		return PLAYER_RACE_IKSAR;
-	case VAHSHIR:
-		return PLAYER_RACE_VAHSHIR;
-	case FROGLOK:
-	case FROGLOK2:
-		return PLAYER_RACE_FROGLOK;
-	case DRAKKIN:
-		return PLAYER_RACE_DRAKKIN;
-	default:
-		return PLAYER_RACE_UNKNOWN; // watch
+		case HUMAN:
+		case BARBARIAN:
+		case ERUDITE:
+		case WOOD_ELF:
+		case HIGH_ELF:
+		case DARK_ELF:
+		case HALF_ELF:
+		case DWARF:
+		case TROLL:
+		case OGRE:
+		case HALFLING:
+		case GNOME:
+			return race_id;
+		case IKSAR:
+			return PLAYER_RACE_IKSAR;
+		case VAHSHIR:
+			return PLAYER_RACE_VAHSHIR;
+		case FROGLOK:
+		case FROGLOK2:
+			return PLAYER_RACE_FROGLOK;
+		case DRAKKIN:
+			return PLAYER_RACE_DRAKKIN;
+		default:
+			return PLAYER_RACE_UNKNOWN; // watch
 	}
 }
 
-uint32 GetPlayerRaceBit(uint16 race_id)
-{
+uint32 GetPlayerRaceBit(uint16 race_id) {
 	switch (race_id) {
-	case HUMAN:
-		return PLAYER_RACE_HUMAN_BIT;
-	case BARBARIAN:
-		return PLAYER_RACE_BARBARIAN_BIT;
-	case ERUDITE:
-		return PLAYER_RACE_ERUDITE_BIT;
-	case WOOD_ELF:
-		return PLAYER_RACE_WOOD_ELF_BIT;
-	case HIGH_ELF:
-		return PLAYER_RACE_HIGH_ELF_BIT;
-	case DARK_ELF:
-		return PLAYER_RACE_DARK_ELF_BIT;
-	case HALF_ELF:
-		return PLAYER_RACE_HALF_ELF_BIT;
-	case DWARF:
-		return PLAYER_RACE_DWARF_BIT;
-	case TROLL:
-		return PLAYER_RACE_TROLL_BIT;
-	case OGRE:
-		return PLAYER_RACE_OGRE_BIT;
-	case HALFLING:
-		return PLAYER_RACE_HALFLING_BIT;
-	case GNOME:
-		return PLAYER_RACE_GNOME_BIT;
-	case IKSAR:
-		return PLAYER_RACE_IKSAR_BIT;
-	case VAHSHIR:
-		return PLAYER_RACE_VAHSHIR_BIT;
-	case FROGLOK:
-		return PLAYER_RACE_FROGLOK_BIT;
-	case DRAKKIN:
-		return PLAYER_RACE_DRAKKIN_BIT;
-	default:
-		return PLAYER_RACE_UNKNOWN_BIT;
+		case HUMAN:
+			return PLAYER_RACE_HUMAN_BIT;
+		case BARBARIAN:
+			return PLAYER_RACE_BARBARIAN_BIT;
+		case ERUDITE:
+			return PLAYER_RACE_ERUDITE_BIT;
+		case WOOD_ELF:
+			return PLAYER_RACE_WOOD_ELF_BIT;
+		case HIGH_ELF:
+			return PLAYER_RACE_HIGH_ELF_BIT;
+		case DARK_ELF:
+			return PLAYER_RACE_DARK_ELF_BIT;
+		case HALF_ELF:
+			return PLAYER_RACE_HALF_ELF_BIT;
+		case DWARF:
+			return PLAYER_RACE_DWARF_BIT;
+		case TROLL:
+			return PLAYER_RACE_TROLL_BIT;
+		case OGRE:
+			return PLAYER_RACE_OGRE_BIT;
+		case HALFLING:
+			return PLAYER_RACE_HALFLING_BIT;
+		case GNOME:
+			return PLAYER_RACE_GNOME_BIT;
+		case IKSAR:
+			return PLAYER_RACE_IKSAR_BIT;
+		case VAHSHIR:
+			return PLAYER_RACE_VAHSHIR_BIT;
+		case FROGLOK:
+			return PLAYER_RACE_FROGLOK_BIT;
+		case DRAKKIN:
+			return PLAYER_RACE_DRAKKIN_BIT;
+		default:
+			return PLAYER_RACE_UNKNOWN_BIT;
 	}
 }
 
-uint16 GetRaceIDFromPlayerRaceValue(uint32 player_race_value)
-{
+uint16 GetRaceIDFromPlayerRaceValue(uint32 player_race_value) {
 	switch (player_race_value) {
-	case PLAYER_RACE_HUMAN:
-	case PLAYER_RACE_BARBARIAN:
-	case PLAYER_RACE_ERUDITE:
-	case PLAYER_RACE_WOOD_ELF:
-	case PLAYER_RACE_HIGH_ELF:
-	case PLAYER_RACE_DARK_ELF:
-	case PLAYER_RACE_HALF_ELF:
-	case PLAYER_RACE_DWARF:
-	case PLAYER_RACE_TROLL:
-	case PLAYER_RACE_OGRE:
-	case PLAYER_RACE_HALFLING:
-	case PLAYER_RACE_GNOME:
-		return player_race_value;
-	case PLAYER_RACE_IKSAR:
-		return IKSAR;
-	case PLAYER_RACE_VAHSHIR:
-		return VAHSHIR;
-	case PLAYER_RACE_FROGLOK:
-		return FROGLOK;
-	case PLAYER_RACE_DRAKKIN:
-		return DRAKKIN;
-	default:
-		return PLAYER_RACE_UNKNOWN; // watch
+		case PLAYER_RACE_HUMAN:
+		case PLAYER_RACE_BARBARIAN:
+		case PLAYER_RACE_ERUDITE:
+		case PLAYER_RACE_WOOD_ELF:
+		case PLAYER_RACE_HIGH_ELF:
+		case PLAYER_RACE_DARK_ELF:
+		case PLAYER_RACE_HALF_ELF:
+		case PLAYER_RACE_DWARF:
+		case PLAYER_RACE_TROLL:
+		case PLAYER_RACE_OGRE:
+		case PLAYER_RACE_HALFLING:
+		case PLAYER_RACE_GNOME:
+			return player_race_value;
+		case PLAYER_RACE_IKSAR:
+			return IKSAR;
+		case PLAYER_RACE_VAHSHIR:
+			return VAHSHIR;
+		case PLAYER_RACE_FROGLOK:
+			return FROGLOK;
+		case PLAYER_RACE_DRAKKIN:
+			return DRAKKIN;
+		default:
+			return PLAYER_RACE_UNKNOWN; // watch
 	}
 }
 
diff --git a/zone/mob.cpp b/zone/mob.cpp
index e53a132a4..ee86e457b 100644
--- a/zone/mob.cpp
+++ b/zone/mob.cpp
@@ -6053,59 +6053,7 @@ void Mob::CommonBreakInvisible()
 }
 
 float Mob::GetDefaultRaceSize() const {
-	switch (race) {
-		case RACE_HUMAN_1:
-			return 6.0;
-			break;
-		case RACE_BARBARIAN_2:
-			return 7.0;
-			break;
-		case RACE_ERUDITE_3:
-			return 6.0;
-			break;
-		case RACE_WOOD_ELF_4:
-			return 5.0;
-			break;
-		case RACE_HIGH_ELF_5:
-			return 6.0;
-			break;
-		case RACE_DARK_ELF_6:
-			return 5.0;
-			break;
-		case RACE_HALF_ELF_7:
-			return 5.5;
-			break;
-		case RACE_DWARF_8:
-			return 4.0;
-			break;
-		case RACE_TROLL_9:
-			return 8.0;
-			break;
-		case RACE_OGRE_10:
-			return 9.0;
-			break;
-		case RACE_HALFLING_11:
-			return 3.5;
-			break;
-		case RACE_GNOME_12:
-			return 3.0;
-			break;
-		case RACE_IKSAR_128:
-			return 6.0;
-			break;
-		case RACE_VAH_SHIR_130:
-			return 7.0;
-			break;
-		case RACE_FROGLOK_330:
-			return 5.0;
-			break;
-		case RACE_DRAKKIN_522:
-			return 5.0;
-			break;
-		default:
-			return 6.0;
-			break;
-	}
+	return GetRaceGenderDefaultHeight(race, gender);
 }