diff --git a/src/server/game/Server/Packets/CharacterPackets.h b/src/server/game/Server/Packets/CharacterPackets.h
index 5b263824a1..1459a7ae80 100644
--- a/src/server/game/Server/Packets/CharacterPackets.h
+++ b/src/server/game/Server/Packets/CharacterPackets.h
@@ -235,9 +235,9 @@ namespace WorldPackets
 
             struct ClassUnlock
             {
-               int8 ClassID = 0;
-               bool HasUnlockedAchievement = false;
-               uint32 AchievementID = 0;
+                int8 ClassID = 0;
+                bool HasUnlockedAchievement = false;
+                uint32 AchievementID = 0;
             };
 
             struct RaceUnlock
diff --git a/src/server/game/Server/Packets/InspectPackets.cpp b/src/server/game/Server/Packets/InspectPackets.cpp
index 75d3b6d784..25f391deaf 100644
--- a/src/server/game/Server/Packets/InspectPackets.cpp
+++ b/src/server/game/Server/Packets/InspectPackets.cpp
@@ -75,17 +75,31 @@ ByteBuffer& operator<<(ByteBuffer& data, InspectItemData const& itemData)
     return data;
 }
 
+ByteBuffer& operator<<(ByteBuffer& data, CharDisplayInfo const& displayInfo)
+{
+    data << SizedString::BitsSize<6>(displayInfo.Name);
+    data << uint8(displayInfo.GenderID);
+    data << uint8(displayInfo.Race);
+    data << uint8(displayInfo.ClassID);
+    data << Size<uint32>(displayInfo.Customizations);
+    data << SizedString::Data(displayInfo.Name);
+
+    for (Character::ChrCustomizationChoice const& customization : displayInfo.Customizations)
+        data << customization;
+
+    return data;
+}
 void PlayerModelDisplayInfo::Initialize(Player const* player)
 {
     GUID = player->GetGUID();
     SpecializationID = AsUnderlyingType(player->GetPrimarySpecialization());
-    Name = player->GetName();
-    GenderID = player->GetNativeGender();
-    Race = player->GetRace();
-    ClassID = player->GetClass();
+    DisplayInfo.Name = player->GetName();
+    DisplayInfo.GenderID = player->GetNativeGender();
+    DisplayInfo.Race = player->GetRace();
+    DisplayInfo.ClassID = player->GetClass();
 
     for (UF::ChrCustomizationChoice const& customization : player->m_playerData->Customizations)
-        Customizations.push_back(customization);
+        DisplayInfo.Customizations.push_back(customization);
 
     for (uint8 i = 0; i < EQUIPMENT_SLOT_END; ++i)
         if (::Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i))
@@ -97,15 +111,7 @@ ByteBuffer& operator<<(ByteBuffer& data, PlayerModelDisplayInfo const& displayIn
     data << displayInfo.GUID;
     data << int32(displayInfo.SpecializationID);
     data << Size<uint32>(displayInfo.Items);
-    data << SizedString::BitsSize<6>(displayInfo.Name);
-    data << uint8(displayInfo.GenderID);
-    data << uint8(displayInfo.Race);
-    data << uint8(displayInfo.ClassID);
-    data << Size<uint32>(displayInfo.Customizations);
-    data << SizedString::Data(displayInfo.Name);
-
-    for (Character::ChrCustomizationChoice const& customization : displayInfo.Customizations)
-        data << customization;
+    data << displayInfo.DisplayInfo;
 
     for (InspectItemData const& item : displayInfo.Items)
         data << item;
diff --git a/src/server/game/Server/Packets/InspectPackets.h b/src/server/game/Server/Packets/InspectPackets.h
index de9d4c61ae..d3241d42c8 100644
--- a/src/server/game/Server/Packets/InspectPackets.h
+++ b/src/server/game/Server/Packets/InspectPackets.h
@@ -75,16 +75,21 @@ namespace WorldPackets
             std::vector<AzeriteEssenceData> AzeriteEssences;
         };
 
-        struct PlayerModelDisplayInfo
+        struct CharDisplayInfo
         {
-            ObjectGuid GUID;
-            std::vector<InspectItemData> Items;
             std::string Name;
-            int32 SpecializationID = 0;
             uint8 GenderID = GENDER_NONE;
             uint8 Race = RACE_NONE;
             uint8 ClassID = CLASS_NONE;
             std::vector<Character::ChrCustomizationChoice> Customizations;
+        };
+
+        struct PlayerModelDisplayInfo
+        {
+            ObjectGuid GUID;
+            int32 SpecializationID = 0;
+            CharDisplayInfo DisplayInfo;
+            std::vector<InspectItemData> Items;
 
             void Initialize(Player const* player);
         };
diff --git a/src/server/game/Server/Packets/PartyPackets.cpp b/src/server/game/Server/Packets/PartyPackets.cpp
index 5596862f0d..8ec48172d0 100644
--- a/src/server/game/Server/Packets/PartyPackets.cpp
+++ b/src/server/game/Server/Packets/PartyPackets.cpp
@@ -79,8 +79,8 @@ WorldPacket const* PartyInvite::Write()
 
     _worldPacket << SizedString::Data(InviterName);
 
-    for (uint32 LfgSlot : LfgSlots)
-        _worldPacket << LfgSlot;
+    for (uint32 lfgSlot : LfgSlots)
+        _worldPacket << lfgSlot;
 
     return &_worldPacket;
 }
diff --git a/src/server/game/Server/Packets/QuestPackets.h b/src/server/game/Server/Packets/QuestPackets.h
index 3466904300..7cb95682d7 100644
--- a/src/server/game/Server/Packets/QuestPackets.h
+++ b/src/server/game/Server/Packets/QuestPackets.h
@@ -459,11 +459,11 @@ namespace WorldPackets
             std::string_view LogDescription;
             std::string_view DescriptionText;
             std::vector<ConditionalQuestText> ConditionalDescriptionText;
-            bool DisplayPopup = false;
-            bool StartCheat = false;
             bool AutoLaunched = false;
             bool FromContentPush = false;
             bool ResetByScheduler = false;
+            bool StartCheat = false;
+            bool DisplayPopup = false;
         };
 
         struct QuestObjectiveCollect
diff --git a/src/server/game/Server/Packets/SystemPackets.h b/src/server/game/Server/Packets/SystemPackets.h
index 40341aa62d..97ee541bc8 100644
--- a/src/server/game/Server/Packets/SystemPackets.h
+++ b/src/server/game/Server/Packets/SystemPackets.h
@@ -171,20 +171,20 @@ namespace WorldPackets
             bool LfgRequireAuthenticatorEnabled      = false;
             bool ScriptsDisallowedForBeta            = false;
             bool TimerunningEnabled                  = false;
-            bool PlayerIdentityOptionsEnabled                     = false; // classic only
+            bool PlayerIdentityOptionsEnabled        = false; // classic only
             bool IsPlayerContentTrackingEnabled      = false;
-            bool LfdEnabled                  = false;
-            bool LfrEnabled                  = true;  // classic only
-            bool PetHappinessEnabled               = true;  // classic only
+            bool LfdEnabled                          = false;
+            bool LfrEnabled                          = true;  // classic only
+            bool PetHappinessEnabled                 = true;  // classic only
             bool GuildEventsEditsEnabled             = true;
             bool GuildTradeSkillsEnabled             = true;
             bool IsAccountCurrencyTransferEnabled    = false;
             bool NetEaseChatTelemetryEnabled         = false;
             bool LobbyMatchmakerQueueFromMainlineEnabled = false;
             bool CanSendLobbyMatchmakerPartyCustomizations = false;
-            bool AddonProfilingEnabled                = false;
+            bool AddonProfilingEnabled               = false;
             bool GlobalUserGeneratedContentMuteEnabled = false;
-            bool AccountUserGeneratedContentIsRisky   = false;
+            bool AccountUserGeneratedContentIsRisky  = false;
 
             SocialQueueConfig QuickJoinConfig;
             SquelchInfo Squelch;