diff --git a/src/game/ChatCommands/GMTicketCommands.cpp b/src/game/ChatCommands/GMTicketCommands.cpp
index 783c80af..6345c7ac 100644
--- a/src/game/ChatCommands/GMTicketCommands.cpp
+++ b/src/game/ChatCommands/GMTicketCommands.cpp
@@ -125,7 +125,7 @@ bool ChatHandler::HandleTicketCloseCommand(char* args)
 
     ObjectGuid target_guid = ticket->GetPlayerGuid();
 
-    // Get Player 
+    // Get Player
     // Can be nullptr if player is offline
     Player* pPlayer = sObjectMgr.GetPlayer(target_guid);
 
@@ -441,7 +441,7 @@ bool ChatHandler::HandleTicketRespondCommand(char* args)
 
     ObjectGuid target_guid = ticket->GetPlayerGuid();
 
-    // Get Player 
+    // Get Player
     // Can be nullptr if player is offline
     Player* target = sObjectMgr.GetPlayer(target_guid);
 
diff --git a/src/game/ChatCommands/MailCommands.cpp b/src/game/ChatCommands/MailCommands.cpp
index 6b08046a..3751277c 100644
--- a/src/game/ChatCommands/MailCommands.cpp
+++ b/src/game/ChatCommands/MailCommands.cpp
@@ -30,7 +30,7 @@
  /**********************************************************************
       CommandTable : mailCommandTable
  /***********************************************************************/
- // Send mail by command
+// Send mail by command
 bool ChatHandler::HandleSendMailCommand(char* args)
 {
     if (!*args)
diff --git a/src/game/Tools/Language.h b/src/game/Tools/Language.h
index 871bc41e..715c1377 100644
--- a/src/game/Tools/Language.h
+++ b/src/game/Tools/Language.h
@@ -1013,8 +1013,7 @@ enum MangosStrings
     LANG_HONOR_LAST_WEEK                = 1438,
     LANG_HONOR_LIFE                     = 1439,
     LANG_COMMAND_TICKETUPDATED          = 1440,
-    // Room for old clients 1.x           1441499 not used
-
+    // Room for old clients 1.x           1441-1499 not used
 
     // Level 2 (continue)
     LANG_POOL_CHANCE_POOL_LIST_CONSOLE  = 1500,
diff --git a/src/game/WorldHandlers/Chat.cpp b/src/game/WorldHandlers/Chat.cpp
index 38cc49a4..98171c4a 100644
--- a/src/game/WorldHandlers/Chat.cpp
+++ b/src/game/WorldHandlers/Chat.cpp
@@ -1021,7 +1021,7 @@ void  ChatHandler::PSendSysMessageMultiline(int32 entry, ...)
     va_end(ap);
 
     std::string mangosString(str);
-    
+
     /* Used for tracking our position within the string while iterating through it */
     std::string::size_type pos = 0, nextpos;
 
@@ -1315,7 +1315,7 @@ void ChatHandler::ExecuteCommand(const char* text)
                         int loc_idx = m_session->GetSessionDbLocaleIndex();
                         sCommandMgr.GetCommandHelpLocaleString(command->Id, loc_idx, &helpText);
                     }
-                   
+
                     SendSysMessage(helpText.c_str());
                 }
                 else
diff --git a/src/game/WorldHandlers/Chat.h b/src/game/WorldHandlers/Chat.h
index e523aebe..20e78cf3 100644
--- a/src/game/WorldHandlers/Chat.h
+++ b/src/game/WorldHandlers/Chat.h
@@ -51,32 +51,32 @@ class Unit;
 
 class ChatCommand
 {
-public:
-    uint32             Id;
-    const char* Name;
-    uint32             SecurityLevel;                   // function pointer required correct align (use uint32)
-    bool               AllowConsole;
-    bool (ChatHandler::* Handler)(char* args);
-    std::string        Help;
-    ChatCommand* ChildCommands;
+    public:
+        uint32             Id;
+        const char* Name;
+        uint32             SecurityLevel;                   // function pointer required correct align (use uint32)
+        bool               AllowConsole;
+        bool (ChatHandler::* Handler)(char* args);
+        std::string        Help;
+        ChatCommand* ChildCommands;
 
-      ChatCommand(
+        ChatCommand(
           const char* pName,
           uint32 pSecurityLevel,
           bool pAllowConsole,
           bool (ChatHandler::* pHandler)(char* args),
           std::string pHelp,
           ChatCommand* pChildCommands
-      )
+        )
          : Id(-1)
-      {
+        {
           Name = pName;
           SecurityLevel = pSecurityLevel;
           AllowConsole = pAllowConsole;
           Handler = pHandler;
           Help = pHelp;
           ChildCommands = pChildCommands;
-      }
+        }
 };
 
 enum ChatCommandSearchResult
diff --git a/src/game/WorldHandlers/GMTicketHandler.cpp b/src/game/WorldHandlers/GMTicketHandler.cpp
index 9384f010..3cfde7ca 100644
--- a/src/game/WorldHandlers/GMTicketHandler.cpp
+++ b/src/game/WorldHandlers/GMTicketHandler.cpp
@@ -88,7 +88,7 @@ void WorldSession::HandleGMTicketUpdateTextOpcode(WorldPacket& recv_data)
 
     GMTicket * ticket = sTicketMgr.GetGMTicket(GetPlayer()->GetObjectGuid());
 
-    // Notify all GM that the ticket has been changed 
+    // Notify all GM that the ticket has been changed
     sObjectAccessor.DoForAllPlayers([ticket, this](Player* player)
         {
             if (player->GetSession()->GetSecurity() >= SEC_GAMEMASTER && player->isAcceptTickets())
diff --git a/src/game/WorldHandlers/Mail.cpp b/src/game/WorldHandlers/Mail.cpp
index 42e82132..e2733ca8 100644
--- a/src/game/WorldHandlers/Mail.cpp
+++ b/src/game/WorldHandlers/Mail.cpp
@@ -323,11 +323,11 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende
 
     // expire time if COD 3 days, if no COD 30 days, if auction sale pending 1 hour
     uint32 expire_delay;
-    
+
     // Normal Mail Expire Timer
     expire_delay = 30 * DAY;
 
-    // auction mail without any items and money
+    // auction mail without any items and money (auction sale note) pending 1 hour
     if (sender.GetMailMessageType() == MAIL_AUCTION && m_items.empty() && !m_money)
     {
         expire_delay = HOUR;
@@ -342,14 +342,11 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende
         // COD Mail Expire Timer
         expire_delay = 3 * DAY;
     }
-    //Mail from GM 
+    //Mail from GM
     else if (sender.GetStationery() == MAIL_STATIONERY_GM)
     {
         expire_delay = 90 * DAY;
     }
-    
-
-    
 
     time_t expire_time = deliver_time + expire_delay;