Merge [SD2] Apply SD2 code style

--HG--
branch : trunk

371 files changed, 8808 insertions, 8808 deletions

diff --git a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp b/src/bindings/scripts/scripts/boss/boss_emeriss.cpp
index f2fc1ab8515..8bd8e0e13db 100644
--- a/src/bindings/scripts/scripts/boss/boss_emeriss.cpp
+++ b/src/bindings/scripts/scripts/boss/boss_emeriss.cpp
@@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI
         //Sleep_Timer
         if (Sleep_Timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_SLEEP);
 
             Sleep_Timer = 8000 + rand()%8000;
@@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI
         //Tailsweep every 2 seconds
         if (TailSweep_Timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_TAILSWEEP);
 
             TailSweep_Timer = 2000;
@@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI
         }else VolatileInfection_Timer -= diff;
 
         //CorruptionofEarth_Timer
-        if ( (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 75)
+        if ((int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 75)
         {
             if (CorruptionofEarth1_Timer < diff)
             {
@@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI
         }
 
         //CorruptionofEarth_Timer
-        if ( (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 50)
+        if ((int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 50)
         {
             if (CorruptionofEarth2_Timer < diff)
             {
@@ -127,7 +127,7 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI
         }
 
         //CorruptionofEarth_Timer
-        if ( (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 25)
+        if ((int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 25)
         {
             if (CorruptionofEarth3_Timer < diff)
             {
diff --git a/src/bindings/scripts/scripts/boss/boss_taerar.cpp b/src/bindings/scripts/scripts/boss/boss_taerar.cpp
index d402a274cb6..a45390b134d 100644
--- a/src/bindings/scripts/scripts/boss/boss_taerar.cpp
+++ b/src/bindings/scripts/scripts/boss/boss_taerar.cpp
@@ -79,7 +79,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI
 
     void SummonShades(Unit* victim)
     {
-        if(!victim)
+        if (!victim)
             return;
 
         Rand = rand()%15;
@@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI
         }
         Rand = 0;
         Summoned = DoSpawnCreature(15302, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
-        if(Summoned)
+        if (Summoned)
             (Summoned->AI())->AttackStart(victim);
     }
 
@@ -141,7 +141,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI
         //Tailsweep every 2 seconds
         if (TailSweep_Timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_TAILSWEEP);
 
             TailSweep_Timer = 2000;
@@ -169,7 +169,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI
         } else BellowingRoar_Timer -= diff;
 
         //Summon 3 Shades
-        if ( !Shades  && (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 75)
+        if (!Shades  && (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 75)
         {
             if (Summon1_Timer < diff)
             {
@@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI
         }
 
         //Summon 3 Shades
-        if ( !Shades  && (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 50)
+        if (!Shades  && (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 50)
         {
             if (Summon2_Timer < diff)
             {
@@ -215,7 +215,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI
         }
 
         //Summon 3 Shades
-        if ( !Shades  && (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 25)
+        if (!Shades  && (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 25)
         {
             if (Summon3_Timer < diff)
             {
diff --git a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp b/src/bindings/scripts/scripts/boss/boss_ysondre.cpp
index e11c2fb247e..32c382ba7f5 100644
--- a/src/bindings/scripts/scripts/boss/boss_ysondre.cpp
+++ b/src/bindings/scripts/scripts/boss/boss_ysondre.cpp
@@ -69,7 +69,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI
 
     void SummonDruids(Unit* victim)
     {
-        if(!victim)
+        if (!victim)
             return;
 
         Rand = rand()%10;
@@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI
         }
         Rand = 0;
         Summoned = DoSpawnCreature(15260, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
-        if(Summoned)
+        if (Summoned)
             (Summoned->AI())->AttackStart(victim);
     }
 
@@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI
         //Sleep_Timer
         if (Sleep_Timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_SLEEP);
 
             Sleep_Timer = 8000 + rand()%7000;
@@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI
         //Tailsweep every 2 seconds
         if (TailSweep_Timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_TAILSWEEP);
 
             TailSweep_Timer = 2000;
@@ -132,14 +132,14 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI
         if (LightningWave_Timer < diff)
         {
             //Cast LIGHTNINGWAVE on a Random target
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_LIGHTNINGWAVE);
 
             LightningWave_Timer = 7000 + rand()%5000;
         }else LightningWave_Timer -= diff;
 
         //Summon Druids
-        if ( (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 75)
+        if ((int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 75)
         {
             if (SummonDruids1_Timer < diff)
             {
@@ -156,7 +156,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI
         }
 
         //Summon Druids
-        if ( (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 50)
+        if ((int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 50)
         {
             if (SummonDruids2_Timer < diff)
             {
@@ -173,7 +173,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI
         }
 
         //Summon Druids
-        if ( (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 25)
+        if ((int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5) == 25)
         {
             if (SummonDruids3_Timer < diff)
             {
diff --git a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp
index 73eb2ebdc40..1a990108b78 100644
--- a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp
+++ b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp
@@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI
 
         //Buff timer (only buff when we are alive and not in combat
         if (!m_creature->isInCombat() && m_creature->isAlive())
-            if (BuffTimer < diff )
+            if (BuffTimer < diff)
             {
                 //Find a spell that targets friendly and applies an aura (these are generally buffs)
                 SpellEntry const *info = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_AURA);
@@ -77,14 +77,14 @@ struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI
             }else BuffTimer -= diff;
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //If we are within range melee the target
-        if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
+        if (m_creature->IsWithinMeleeRange(m_creature->getVictim()))
         {
             //Make sure our attack is ready and we arn't currently casting
-            if( m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
+            if (m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
             {
                 bool Healing = false;
                 SpellEntry const *info = NULL;
@@ -176,9 +176,9 @@ struct TRINITY_DLL_DECL trigger_periodicAI : public NullCreatureAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(timer < diff)
+        if (timer < diff)
         {
-            if(spell)
+            if (spell)
                 me->CastSpell(me, spell, true);
             timer = interval;
         }
@@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL trigger_deathAI : public NullCreatureAI
     trigger_deathAI(Creature* c) : NullCreatureAI(c) {}
     void JustDied(Unit *killer)
     {
-        if(me->m_spells[0])
+        if (me->m_spells[0])
             me->CastSpell(killer, me->m_spells[0], true);
     }
 };
@@ -206,15 +206,15 @@ struct TRINITY_DLL_DECL mob_webwrapAI : public NullCreatureAI
     void SetGUID(const uint64 &guid, int32 param)
     {
         victimGUID = guid;
-        if(me->m_spells[0] && victimGUID)
-            if(Unit *victim = Unit::GetUnit(*me, victimGUID))
+        if (me->m_spells[0] && victimGUID)
+            if (Unit *victim = Unit::GetUnit(*me, victimGUID))
                 victim->CastSpell(victim, me->m_spells[0], true, NULL, NULL, me->GetGUID());
     }
 
     void JustDied(Unit *killer)
     {
-        if(me->m_spells[0] && victimGUID)
-            if(Unit *victim = Unit::GetUnit(*me, victimGUID))
+        if (me->m_spells[0] && victimGUID)
+            if (Unit *victim = Unit::GetUnit(*me, victimGUID))
                 victim->RemoveAurasDueToSpell(me->m_spells[0], me->GetGUID());
     }
 };
diff --git a/src/bindings/scripts/scripts/custom/custom_example.cpp b/src/bindings/scripts/scripts/custom/custom_example.cpp
index 7b5a695be6b..8d232f13099 100644
--- a/src/bindings/scripts/scripts/custom/custom_example.cpp
+++ b/src/bindings/scripts/scripts/custom/custom_example.cpp
@@ -216,37 +216,37 @@ CreatureAI* GetAI_custom_example(Creature *_Creature)
 }
 
 //This function is called when the player clicks an option on the gossip menu
-void SendDefaultMenu_custom_example(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_custom_example(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)               //Fight time
     {
         //Set our faction to hostile twoards all
         _Creature->setFaction(24);
-        _Creature->Attack(player, true);
-        player->PlayerTalkClass->CloseGossip();
+        _Creature->Attack(pPlayer, true);
+        pPlayer->PlayerTalkClass->CloseGossip();
     }
 }
 
 //This function is called when the player clicks an option on the gossip menu
-bool GossipSelect_custom_example(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_custom_example(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (sender == GOSSIP_SENDER_MAIN)
-        SendDefaultMenu_custom_example(player, _Creature, action);
+        SendDefaultMenu_custom_example(pPlayer, _Creature, action);
 
     return true;
 }
 
 //This function is called when the player opens the gossip menu
-bool GossipHello_custom_example(Player *player, Creature *_Creature)
+bool GossipHello_custom_example(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
 
     return true;
 }
 
 //Our Recive emote function
-bool ReceiveEmote_custom_example(Player *player, Creature *_Creature, uint32 emote)
+bool ReceiveEmote_custom_example(Player* pPlayer, Creature *_Creature, uint32 emote)
 {
     _Creature->HandleEmoteCommand(emote);
 
diff --git a/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp b/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp
index 051f79a0cb5..1e726566984 100644
--- a/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp
+++ b/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp
@@ -25,43 +25,43 @@ EndScriptData */
 #include <cstring>
 
 //This function is called when the player opens the gossip menubool
-bool GossipHello_custom_gossip_codebox(Player *player, Creature *_Creature)
+bool GossipHello_custom_gossip_codebox(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM_EXTENDED(0, "A quiz: what's your name?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'm not interested", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, "A quiz: what's your name?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'm not interested", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
 
-    player->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
+    pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
     return true;
 }
 
 //This function is called when the player clicks an option on the gossip menubool
-bool GossipSelect_custom_gossip_codebox(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_custom_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if(action == GOSSIP_ACTION_INFO_DEF+2)
+    if (action == GOSSIP_ACTION_INFO_DEF+2)
     {
         _Creature->Say("Normal select, guess you're not interested.", LANG_UNIVERSAL, 0);
-        player->CLOSE_GOSSIP_MENU();
+        pPlayer->CLOSE_GOSSIP_MENU();
     }
     return true;
 }
 
-bool GossipSelectWithCode_custom_gossip_codebox( Player *player, Creature *_Creature, uint32 sender, uint32 action, const char* sCode )
+bool GossipSelectWithCode_custom_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action, const char* sCode)
 {
-    if(sender == GOSSIP_SENDER_MAIN)
+    if (sender == GOSSIP_SENDER_MAIN)
     {
-        if(action == GOSSIP_ACTION_INFO_DEF+1)
+        if (action == GOSSIP_ACTION_INFO_DEF+1)
         {
-            if(std::strcmp(sCode, player->GetName())!=0)
+            if (std::strcmp(sCode, pPlayer->GetName())!=0)
             {
                 _Creature->Say("Wrong!", LANG_UNIVERSAL, 0);
-                _Creature->CastSpell(player, 12826, true);
+                _Creature->CastSpell(pPlayer, 12826, true);
             }
             else
             {
                 _Creature->Say("You're right, you are allowed to see my inner secrets.", LANG_UNIVERSAL, 0);
-                _Creature->CastSpell(player, 26990, true);
+                _Creature->CastSpell(pPlayer, 26990, true);
             }
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CLOSE_GOSSIP_MENU();
             return true;
         }
     }
diff --git a/src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp b/src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp
index 56cb92222db..395c7b8cb0c 100644
--- a/src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp
+++ b/src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp
@@ -3,24 +3,24 @@
 
 #define GOSSIP_FLIGHT "I need a ride"
 
-bool GossipHello_npc_acherus_taxi(Player *player, Creature *_Creature)
+bool GossipHello_npc_acherus_taxi(Player* pPlayer, Creature *_Creature)
 {
-player->SetTaxiCheater(true);
+pPlayer->SetTaxiCheater(true);
 
-player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-        player->SEND_GOSSIP_MENU(9978,_Creature->GetGUID());
+pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        pPlayer->SEND_GOSSIP_MENU(9978,_Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_acherus_taxi(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_acherus_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)
     { 
-       if (player->GetPositionZ() >=316)       
+       if (pPlayer->GetPositionZ() >=316)       
         {
-        player->GetSession()->SendDoFlight(24446, 1053); 
+        pPlayer->GetSession()->SendDoFlight(24446, 1053); 
         }else{
-        player->GetSession()->SendDoFlight(24446, 1054);
+        pPlayer->GetSession()->SendDoFlight(24446, 1054);
         }
 
     }
diff --git a/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp b/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp
index 73a06646de9..5774bbb3df5 100644
--- a/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp
+++ b/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp
@@ -8,84 +8,84 @@
 #define GOSSIP_BOTTOM  "Yes, Please. I would like to return to the ground floor of the temple."
 #define GOSSIP_ONEDOWN "I would like to see Lord Afrasastrasz, in the middle of the temple."
 
-bool GossipHello_npc_wyrmresttempel_middle_taxi(Player *player, Creature *_Creature)
+bool GossipHello_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature *_Creature)
 {
-player->SetTaxiCheater(true);
+pPlayer->SetTaxiCheater(true);
 
-player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DOWN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-        player->SEND_GOSSIP_MENU(12887,_Creature->GetGUID()); 
+pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DOWN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+        pPlayer->SEND_GOSSIP_MENU(12887,_Creature->GetGUID()); 
         
     return true;
 }
 
-bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)
     {          
-        player->GetSession()->SendDoFlight(6376, 881);
+        pPlayer->GetSession()->SendDoFlight(6376, 881);
     }
     
 
     if (action == GOSSIP_ACTION_INFO_DEF + 2)
     {
-      player->GetSession()->SendDoFlight(6376, 882);
+      pPlayer->GetSession()->SendDoFlight(6376, 882);
 
     }
 return true;
 }
 
-bool GossipHello_npc_wyrmresttempel_bottom_taxi(Player *player, Creature *_Creature)
+bool GossipHello_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature *_Creature)
 {
-player->SetTaxiCheater(true);
+pPlayer->SetTaxiCheater(true);
 
-player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TOP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MIDDLE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-        player->SEND_GOSSIP_MENU(12713,_Creature->GetGUID());
+pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TOP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MIDDLE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+        pPlayer->SEND_GOSSIP_MENU(12713,_Creature->GetGUID());
         
     return true;
 }
 
 
 
-bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 4)
     {         
-        player->GetSession()->SendDoFlight(6376, 878);
+        pPlayer->GetSession()->SendDoFlight(6376, 878);
     }
     
 
     if (action == GOSSIP_ACTION_INFO_DEF + 3)
     {
-      player->GetSession()->SendDoFlight(6376, 883);
+      pPlayer->GetSession()->SendDoFlight(6376, 883);
 
     }
 return true;
 }
 
-bool GossipHello_npc_wyrmresttempel_top_taxi(Player *player, Creature *_Creature)
+bool GossipHello_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature *_Creature)
 {
-player->SetTaxiCheater(true);
+pPlayer->SetTaxiCheater(true);
 
-player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BOTTOM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ONEDOWN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-        player->SEND_GOSSIP_MENU(12714,_Creature->GetGUID());
+pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BOTTOM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ONEDOWN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+        pPlayer->SEND_GOSSIP_MENU(12714,_Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_wyrmresttempel_top_taxi(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 5)
     {      
-        player->GetSession()->SendDoFlight(6376, 879);
+        pPlayer->GetSession()->SendDoFlight(6376, 879);
     }
 
     if (action == GOSSIP_ACTION_INFO_DEF + 6)
 
     {
-      player->GetSession()->SendDoFlight(6376, 880);
+      pPlayer->GetSession()->SendDoFlight(6376, 880);
 
     }
 return true;
diff --git a/src/bindings/scripts/scripts/custom/test.cpp b/src/bindings/scripts/scripts/custom/test.cpp
index fc3cfeb4342..97395cfd9d8 100644
--- a/src/bindings/scripts/scripts/custom/test.cpp
+++ b/src/bindings/scripts/scripts/custom/test.cpp
@@ -47,7 +47,7 @@ struct TRINITY_DLL_DECL npc_testAI : public npc_escortAI
                 {
                     m_creature->Say("Wild Felboar attack!", LANG_UNIVERSAL, 0);
                     Creature* temp = m_creature->SummonCreature(21878, m_creature->GetPositionX()+5, m_creature->GetPositionY()+7, m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 3000);
-                    if(temp)
+                    if (temp)
                         temp->AI()->AttackStart(m_creature);
                 }
                 break;
@@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL npc_testAI : public npc_escortAI
                 if (killer == m_creature)
                 {
                     Unit *pTemp = Unit::GetUnit(*m_creature,PlayerGUID);
-                    if( pTemp )
+                    if (pTemp)
                         DoWhisper("How dare you leave me like that! I hate you! =*(", pTemp);
                 }
                 else m_creature->Say("...no...how could you let me die $N", LANG_UNIVERSAL, PlayerGUID);
@@ -147,41 +147,41 @@ CreatureAI* GetAI_test(Creature *_Creature)
     return (CreatureAI*)testAI;
 }
 
-bool GossipHello_npc_test(Player *player, Creature *_Creature)
+bool GossipHello_npc_test(Player* pPlayer, Creature *_Creature)
 {
-    player->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID());
-    _Creature->prepareGossipMenu(player,0);
+    pPlayer->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID());
+    _Creature->prepareGossipMenu(pPlayer,0);
 
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(Attack, Defend, Run)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(NoAttack, NoDefend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(NoAttack, Defend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(Attack, Defend, Run)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(NoAttack, NoDefend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(NoAttack, Defend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
 
-    _Creature->sendPreparedGossip( player );
+    _Creature->sendPreparedGossip(pPlayer);
     return true;
 }
 
-bool GossipSelect_npc_test(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_test(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->CLOSE_GOSSIP_MENU();
-        ((npc_escortAI*)(_Creature->AI()))->Start(true, true, player->GetGUID());
+        pPlayer->CLOSE_GOSSIP_MENU();
+        ((npc_escortAI*)(_Creature->AI()))->Start(true, true, pPlayer->GetGUID());
 
         return true;                                        // prevent Trinity core handling
     }
 
     if (action == GOSSIP_ACTION_INFO_DEF+2)
     {
-        player->CLOSE_GOSSIP_MENU();
-        ((npc_escortAI*)(_Creature->AI()))->Start(false, false, player->GetGUID());
+        pPlayer->CLOSE_GOSSIP_MENU();
+        ((npc_escortAI*)(_Creature->AI()))->Start(false, false, pPlayer->GetGUID());
 
         return true;                                        // prevent Trinity core handling
     }
 
     if (action == GOSSIP_ACTION_INFO_DEF+3)
     {
-        player->CLOSE_GOSSIP_MENU();
-        ((npc_escortAI*)(_Creature->AI()))->Start(false, false, player->GetGUID());
+        pPlayer->CLOSE_GOSSIP_MENU();
+        ((npc_escortAI*)(_Creature->AI()))->Start(false, false, pPlayer->GetGUID());
 
         return true;                                        // prevent Trinity core handling
     }
diff --git a/src/bindings/scripts/scripts/examples/example_creature.cpp b/src/bindings/scripts/scripts/examples/example_creature.cpp
index ee477ba4e31..ae847b627a5 100644
--- a/src/bindings/scripts/scripts/examples/example_creature.cpp
+++ b/src/bindings/scripts/scripts/examples/example_creature.cpp
@@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI
     }
 
     //Our Recive emote function
-    void ReceiveEmote(Player *player, uint32 emote)
+    void ReceiveEmote(Player* pPlayer, uint32 emote)
     {
         m_creature->HandleEmoteCommand(emote);
 
@@ -212,31 +212,31 @@ CreatureAI* GetAI_example_creature(Creature *_Creature)
 }
 
 //This function is called when the player clicks an option on the gossip menu
-void SendDefaultMenu_example_creature(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_example_creature(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)               //Fight time
     {
         //Set our faction to hostile twoards all
         _Creature->setFaction(24);
-        _Creature->Attack(player, true);
-        player->PlayerTalkClass->CloseGossip();
+        _Creature->Attack(pPlayer, true);
+        pPlayer->PlayerTalkClass->CloseGossip();
     }
 }
 
 //This function is called when the player clicks an option on the gossip menu
-bool GossipSelect_example_creature(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_example_creature(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (sender == GOSSIP_SENDER_MAIN)
-        SendDefaultMenu_example_creature(player, _Creature, action);
+        SendDefaultMenu_example_creature(pPlayer, _Creature, action);
 
     return true;
 }
 
 //This function is called when the player opens the gossip menu
-bool GossipHello_example_creature(Player *player, Creature *_Creature)
+bool GossipHello_example_creature(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
 
     return true;
 }
diff --git a/src/bindings/scripts/scripts/examples/example_escort.cpp b/src/bindings/scripts/scripts/examples/example_escort.cpp
index 3c81797c2a6..67a892c9d58 100644
--- a/src/bindings/scripts/scripts/examples/example_escort.cpp
+++ b/src/bindings/scripts/scripts/examples/example_escort.cpp
@@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI
                 {
                     DoScriptText(SAY_WP_2, m_creature);
                     Creature* temp = m_creature->SummonCreature(21878, m_creature->GetPositionX()+5, m_creature->GetPositionY()+7, m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 3000);
-                    if(temp)
+                    if (temp)
                     temp->AI()->AttackStart(m_creature);
                 }
                 break;
@@ -133,7 +133,7 @@ struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI
                     DeathCoilTimer = 4000;
                 }else DeathCoilTimer -= diff;
             }
-            else if(!m_creature->isInCombat())
+            else if (!m_creature->isInCombat())
             {
                 //Out of combat but being escorted
                 if (IsBeingEscorted)
@@ -168,41 +168,41 @@ CreatureAI* GetAI_example_escort(Creature *_Creature)
     return testAI;
 }
 
-bool GossipHello_example_escort(Player *player, Creature *_Creature)
+bool GossipHello_example_escort(Player* pPlayer, Creature *_Creature)
 {
-    player->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID());
-    _Creature->prepareGossipMenu(player,0);
+    pPlayer->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID());
+    _Creature->prepareGossipMenu(pPlayer,0);
 
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
 
-    _Creature->sendPreparedGossip( player );
+    _Creature->sendPreparedGossip(pPlayer);
     return true;
 }
 
-bool GossipSelect_example_escort(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_example_escort(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->CLOSE_GOSSIP_MENU();
-        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, true, player->GetGUID());
+        pPlayer->CLOSE_GOSSIP_MENU();
+        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, true, pPlayer->GetGUID());
 
         return true;                                        // prevent mangos core handling
     }
 
     if (action == GOSSIP_ACTION_INFO_DEF+2)
     {
-        player->CLOSE_GOSSIP_MENU();
-        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, false, player->GetGUID());
+        pPlayer->CLOSE_GOSSIP_MENU();
+        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, false, pPlayer->GetGUID());
 
         return true;                                        // prevent mangos core handling
     }
 
     if (action == GOSSIP_ACTION_INFO_DEF+3)
     {
-        player->CLOSE_GOSSIP_MENU();
-        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, player->GetGUID());
+        pPlayer->CLOSE_GOSSIP_MENU();
+        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, pPlayer->GetGUID());
 
         return true;                                        // prevent mangos core handling
     }
diff --git a/src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp b/src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp
index 21958977c87..ed17220f806 100644
--- a/src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp
+++ b/src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp
@@ -32,43 +32,43 @@ EndScriptData */
 #define GOSSIP_ITEM_2       "I'm not interested"
 
 //This function is called when the player opens the gossip menubool
-bool GossipHello_example_gossip_codebox(Player *player, Creature *_Creature)
+bool GossipHello_example_gossip_codebox(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
 
-    player->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
+    pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
     return true;
 }
 
 //This function is called when the player clicks an option on the gossip menubool
-bool GossipSelect_example_gossip_codebox(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_example_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if(action == GOSSIP_ACTION_INFO_DEF+2)
+    if (action == GOSSIP_ACTION_INFO_DEF+2)
     {
         DoScriptText(SAY_NOT_INTERESTED, _Creature);
-        player->CLOSE_GOSSIP_MENU();
+        pPlayer->CLOSE_GOSSIP_MENU();
     }
     return true;
 }
 
-bool GossipSelectWithCode_example_gossip_codebox( Player *player, Creature *_Creature, uint32 sender, uint32 action, const char* sCode )
+bool GossipSelectWithCode_example_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action, const char* sCode)
 {
-    if(sender == GOSSIP_SENDER_MAIN)
+    if (sender == GOSSIP_SENDER_MAIN)
     {
-        if(action == GOSSIP_ACTION_INFO_DEF+1)
+        if (action == GOSSIP_ACTION_INFO_DEF+1)
         {
-            if(std::strcmp(sCode, player->GetName())!=0)
+            if (std::strcmp(sCode, pPlayer->GetName())!=0)
             {
                 DoScriptText(SAY_WRONG, _Creature);
-                _Creature->CastSpell(player, 12826, true);
+                _Creature->CastSpell(pPlayer, 12826, true);
             }
             else
             {
                 DoScriptText(SAY_CORRECT, _Creature);
-                _Creature->CastSpell(player, 26990, true);
+                _Creature->CastSpell(pPlayer, 26990, true);
             }
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CLOSE_GOSSIP_MENU();
             return true;
         }
     }
diff --git a/src/bindings/scripts/scripts/examples/example_misc.cpp b/src/bindings/scripts/scripts/examples/example_misc.cpp
index 63136c6bc5d..da2933a133c 100644
--- a/src/bindings/scripts/scripts/examples/example_misc.cpp
+++ b/src/bindings/scripts/scripts/examples/example_misc.cpp
@@ -25,22 +25,22 @@ EndScriptData */
 
 #define SAY_HI  -1999925
 
-bool AT_example_areatrigger(Player *player, AreaTriggerEntry *at)
+bool AT_example_areatrigger(Player* pPlayer, AreaTriggerEntry *at)
 {
-    DoScriptText(SAY_HI, player);
+    DoScriptText(SAY_HI, pPlayer);
     return true;
 }
 
 extern void LoadDatabase();
-bool ItemUse_example_item(Player *player, Item* _Item, SpellCastTargets const& targets)
+bool ItemUse_example_item(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
 {
     LoadDatabase();
     return true;
 }
 
-bool GOHello_example_go_teleporter(Player *player, GameObject* _GO)
+bool GOHello_example_go_teleporter(Player* pPlayer, GameObject* _GO)
 {
-    player->TeleportTo(0, 1807.07f,336.105f,70.3975f,0.0f);
+    pPlayer->TeleportTo(0, 1807.07f,336.105f,70.3975f,0.0f);
     return false;
 }
 
diff --git a/src/bindings/scripts/scripts/go/go_scripts.cpp b/src/bindings/scripts/scripts/go/go_scripts.cpp
index b50a0b79bf4..006acdaacac 100644
--- a/src/bindings/scripts/scripts/go/go_scripts.cpp
+++ b/src/bindings/scripts/scripts/go/go_scripts.cpp
@@ -51,9 +51,9 @@ enum
     SPELL_SUMMON_GHOST_SABER    = 5968,
 };
 
-bool GOHello_go_cat_figurine(Player *player, GameObject* _GO)
+bool GOHello_go_cat_figurine(Player* pPlayer, GameObject* _GO)
 {
-    player->CastSpell(player,SPELL_SUMMON_GHOST_SABER,true);
+    pPlayer->CastSpell(pPlayer,SPELL_SUMMON_GHOST_SABER,true);
     return false;
 }
 
@@ -61,44 +61,44 @@ bool GOHello_go_cat_figurine(Player *player, GameObject* _GO)
 ## go_crystal_pylons (3x)
 ######*/
 
-bool GOHello_go_northern_crystal_pylon(Player *player, GameObject* _GO)
+bool GOHello_go_northern_crystal_pylon(Player* pPlayer, GameObject* _GO)
 {
     if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
     {
-        player->PrepareQuestMenu(_GO->GetGUID());
-        player->SendPreparedQuest(_GO->GetGUID());
+        pPlayer->PrepareQuestMenu(_GO->GetGUID());
+        pPlayer->SendPreparedQuest(_GO->GetGUID());
     }
 
-    if (player->GetQuestStatus(4285) == QUEST_STATUS_INCOMPLETE)
-        player->AreaExploredOrEventHappens(4285);
+    if (pPlayer->GetQuestStatus(4285) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->AreaExploredOrEventHappens(4285);
 
     return true;
 }
 
-bool GOHello_go_eastern_crystal_pylon(Player *player, GameObject* _GO)
+bool GOHello_go_eastern_crystal_pylon(Player* pPlayer, GameObject* _GO)
 {
     if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
     {
-        player->PrepareQuestMenu(_GO->GetGUID());
-        player->SendPreparedQuest(_GO->GetGUID());
+        pPlayer->PrepareQuestMenu(_GO->GetGUID());
+        pPlayer->SendPreparedQuest(_GO->GetGUID());
     }
 
-    if (player->GetQuestStatus(4287) == QUEST_STATUS_INCOMPLETE)
-        player->AreaExploredOrEventHappens(4287);
+    if (pPlayer->GetQuestStatus(4287) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->AreaExploredOrEventHappens(4287);
 
     return true;
 }
 
-bool GOHello_go_western_crystal_pylon(Player *player, GameObject* _GO)
+bool GOHello_go_western_crystal_pylon(Player* pPlayer, GameObject* _GO)
 {
     if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
     {
-        player->PrepareQuestMenu(_GO->GetGUID());
-        player->SendPreparedQuest(_GO->GetGUID());
+        pPlayer->PrepareQuestMenu(_GO->GetGUID());
+        pPlayer->SendPreparedQuest(_GO->GetGUID());
     }
 
-    if (player->GetQuestStatus(4288) == QUEST_STATUS_INCOMPLETE)
-        player->AreaExploredOrEventHappens(4288);
+    if (pPlayer->GetQuestStatus(4288) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->AreaExploredOrEventHappens(4288);
 
     return true;
 }
@@ -107,11 +107,11 @@ bool GOHello_go_western_crystal_pylon(Player *player, GameObject* _GO)
 ## go_barov_journal
 ######*/
 
-bool GOHello_go_barov_journal(Player *player, GameObject* _GO)
+bool GOHello_go_barov_journal(Player* pPlayer, GameObject* _GO)
 {
-    if(player->HasSkill(SKILL_TAILORING) && player->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !player->HasSpell(26086))
+    if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086))
     {
-        player->CastSpell(player,26095,false);
+        pPlayer->CastSpell(pPlayer,26095,false);
     }
     return true;
 }
@@ -120,11 +120,11 @@ bool GOHello_go_barov_journal(Player *player, GameObject* _GO)
 ## go_field_repair_bot_74A
 ######*/
 
-bool GOHello_go_field_repair_bot_74A(Player *player, GameObject* _GO)
+bool GOHello_go_field_repair_bot_74A(Player* pPlayer, GameObject* _GO)
 {
-    if(player->HasSkill(SKILL_ENGINERING) && player->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !player->HasSpell(22704))
+    if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704))
     {
-        player->CastSpell(player,22864,false);
+        pPlayer->CastSpell(pPlayer,22864,false);
     }
     return true;
 }
@@ -153,10 +153,10 @@ bool GOHello_go_gilded_brazier(Player* pPlayer, GameObject* pGO)
 ## go_orb_of_command
 ######*/
 
-bool GOHello_go_orb_of_command(Player *player, GameObject* _GO)
+bool GOHello_go_orb_of_command(Player* pPlayer, GameObject* _GO)
 {
-    if( player->GetQuestRewardStatus(7761) )
-        player->CastSpell(player,23460,true);
+    if (pPlayer->GetQuestRewardStatus(7761))
+        pPlayer->CastSpell(pPlayer,23460,true);
 
     return true;
 }
@@ -165,11 +165,11 @@ bool GOHello_go_orb_of_command(Player *player, GameObject* _GO)
 ## go_tablet_of_madness
 ######*/
 
-bool GOHello_go_tablet_of_madness(Player *player, GameObject* _GO)
+bool GOHello_go_tablet_of_madness(Player* pPlayer, GameObject* _GO)
 {
-    if (player->HasSkill(SKILL_ALCHEMY) && player->GetSkillValue(SKILL_ALCHEMY) >= 300 && !player->HasSpell(24266))
+    if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266))
     {
-        player->CastSpell(player,24267,false);
+        pPlayer->CastSpell(pPlayer,24267,false);
     }
     return true;
 }
@@ -179,13 +179,13 @@ bool GOHello_go_tablet_of_madness(Player *player, GameObject* _GO)
 ######*/
 
 //TODO: use gossip option ("Transcript the Tablet") instead, if Trinity adds support.
-bool GOHello_go_tablet_of_the_seven(Player *player, GameObject* _GO)
+bool GOHello_go_tablet_of_the_seven(Player* pPlayer, GameObject* _GO)
 {
     if (_GO->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER)
         return true;
 
-    if (player->GetQuestStatus(4296) == QUEST_STATUS_INCOMPLETE)
-        player->CastSpell(player,15065,false);
+    if (pPlayer->GetQuestStatus(4296) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->CastSpell(pPlayer,15065,false);
 
     return true;
 }
@@ -194,10 +194,10 @@ bool GOHello_go_tablet_of_the_seven(Player *player, GameObject* _GO)
 ## go_jump_a_tron
 ######*/
 
-bool GOHello_go_jump_a_tron(Player *player, GameObject* _GO)
+bool GOHello_go_jump_a_tron(Player* pPlayer, GameObject* _GO)
 {
-    if (player->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE)
-     player->CastSpell(player,33382,true);
+    if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE)
+     pPlayer->CastSpell(pPlayer,33382,true);
 
     return true;
 }
@@ -226,11 +226,11 @@ bool GOHello_go_ethereum_prison(Player* pPlayer, GameObject* pGo)
 {
     int Random = rand() % (sizeof(NpcPrisonEntry) / sizeof(uint32));
 
-    if(Creature* pCreature = pPlayer->SummonCreature(NpcPrisonEntry[Random],
+    if (Creature* pCreature = pPlayer->SummonCreature(NpcPrisonEntry[Random],
         pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), pGo->GetAngle(pPlayer),
         TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000))
     {
-        if(!pCreature->IsHostileTo(pPlayer))
+        if (!pCreature->IsHostileTo(pPlayer))
         {
             uint32 Spell = 0;
             FactionTemplateEntry const* pFaction = pCreature->getFactionTemplateEntry();
@@ -245,7 +245,7 @@ bool GOHello_go_ethereum_prison(Player* pPlayer, GameObject* pGo)
                 case 970: Spell = SPELL_REP_SPOR; break;
             }
 
-            if(Spell)
+            if (Spell)
                 pCreature->CastSpell(pPlayer, Spell, false);
             else
                 error_log("TSCR: go_ethereum_prison summoned creature (entry %u) but faction (%u) are not expected by script.", pCreature->GetEntry(), pCreature->getFaction());
@@ -340,7 +340,7 @@ bool GOHello_go_shrine_of_the_birds(Player* pPlayer, GameObject* pGo)
             break;
     }
 
-    if(BirdEntry)
+    if (BirdEntry)
         pPlayer->SummonCreature(BirdEntry, fX, fY, fZ, pGo->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
 
     return false;
diff --git a/src/bindings/scripts/scripts/guard/guard_ai.cpp b/src/bindings/scripts/scripts/guard/guard_ai.cpp
index de36df69cf5..7f1daa1e2df 100644
--- a/src/bindings/scripts/scripts/guard/guard_ai.cpp
+++ b/src/bindings/scripts/scripts/guard/guard_ai.cpp
@@ -70,7 +70,7 @@ void guardAI::UpdateAI(const uint32 diff)
 
     //Buff timer (only buff when we are alive and not in combat
     if (m_creature->isAlive() && !m_creature->isInCombat())
-        if (BuffTimer < diff )
+        if (BuffTimer < diff)
     {
         //Find a spell that targets friendly and applies an aura (these are generally buffs)
         SpellEntry const *info = SelectSpell(m_creature, -1, -1, SELECT_TARGET_ANY_FRIEND, 0, 0, 0, 0, SELECT_EFFECT_AURA);
@@ -94,10 +94,10 @@ void guardAI::UpdateAI(const uint32 diff)
         return;
 
     // Make sure our attack is ready and we arn't currently casting
-    if( m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
+    if (m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
     {
         //If we are within range melee the target
-        if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
+        if (m_creature->IsWithinMeleeRange(m_creature->getVictim()))
         {
             bool Healing = false;
             SpellEntry const *info = NULL;
@@ -183,14 +183,14 @@ void guardAI::DoReplyToTextEmote(uint32 em)
     }
 }
 
-void guardAI_orgrimmar::ReceiveEmote(Player *player, uint32 text_emote)
+void guardAI_orgrimmar::ReceiveEmote(Player* pPlayer, uint32 text_emote)
 {
-    if (player->GetTeam()==HORDE)
+    if (pPlayer->GetTeam()==HORDE)
         DoReplyToTextEmote(text_emote);
 }
 
-void guardAI_stormwind::ReceiveEmote(Player *player, uint32 text_emote)
+void guardAI_stormwind::ReceiveEmote(Player* pPlayer, uint32 text_emote)
 {
-    if (player->GetTeam() == ALLIANCE)
+    if (pPlayer->GetTeam() == ALLIANCE)
         DoReplyToTextEmote(text_emote);
 }
diff --git a/src/bindings/scripts/scripts/guard/guards.cpp b/src/bindings/scripts/scripts/guard/guards.cpp
index 1c3381fc2e4..0c633513f1b 100644
--- a/src/bindings/scripts/scripts/guard/guards.cpp
+++ b/src/bindings/scripts/scripts/guard/guards.cpp
@@ -83,172 +83,172 @@ EndContentData */
  * guard_azuremyst start
  *******************************************************/
 
-bool GossipHello_guard_azuremyst(Player *player, Creature *_Creature)
-{
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK            , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HIPPOGRYPH      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN             , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->SEND_GOSSIP_MENU(10066,_Creature->GetGUID());
+bool GossipHello_guard_azuremyst(Player* pPlayer, Creature *_Creature)
+{
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK            , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HIPPOGRYPH      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN             , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->SEND_GOSSIP_MENU(10066,_Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_azuremyst(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_azuremyst(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Bank
-            player->SEND_POI(-3918.95, -11544.7, 7, 6, 0, "Bank");
-            player->SEND_GOSSIP_MENU(10067,_Creature->GetGUID());
+            pPlayer->SEND_POI(-3918.95, -11544.7, 7, 6, 0, "Bank");
+            pPlayer->SEND_GOSSIP_MENU(10067,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Hippogryph Master
-            player->SEND_POI(-4057.15, -11788.6, 7, 6, 0, "Stephanos");
-            player->SEND_GOSSIP_MENU(10071,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4057.15, -11788.6, 7, 6, 0, "Stephanos");
+            pPlayer->SEND_GOSSIP_MENU(10071,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Guild master
-            player->SEND_POI(-4092.43, -11626.6, 7, 6, 0, "Funaam");
-            player->SEND_GOSSIP_MENU(10073,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4092.43, -11626.6, 7, 6, 0, "Funaam");
+            pPlayer->SEND_GOSSIP_MENU(10073,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Inn
-            player->SEND_POI(-4129.43, -12469, 7, 6, 0, "Caregiver Chellan");
-            player->SEND_GOSSIP_MENU(10074,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4129.43, -12469, 7, 6, 0, "Caregiver Chellan");
+            pPlayer->SEND_GOSSIP_MENU(10074,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Stable Master
-            player->SEND_POI(-4146.42, -12492.7, 7, 6, 0, "Esbina");
-            player->SEND_GOSSIP_MENU(10075,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4146.42, -12492.7, 7, 6, 0, "Esbina");
+            pPlayer->SEND_GOSSIP_MENU(10075,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->SEND_GOSSIP_MENU(10076,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(10076,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 13);
-            player->SEND_GOSSIP_MENU(10087,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 13);
+            pPlayer->SEND_GOSSIP_MENU(10087,_Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_azuremyst(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_azuremyst(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Druid
-            player->SEND_POI(-4274.81, -11495.3, 7, 6, 0, "Shalannius");
-            player->SEND_GOSSIP_MENU(10077,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4274.81, -11495.3, 7, 6, 0, "Shalannius");
+            pPlayer->SEND_GOSSIP_MENU(10077,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Hunter
-            player->SEND_POI(-4203.65, -12526.5, 7, 6, 0, "Acteon");
-            player->SEND_GOSSIP_MENU(10078,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4203.65, -12526.5, 7, 6, 0, "Acteon");
+            pPlayer->SEND_GOSSIP_MENU(10078,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Mage
-            player->SEND_POI(-4149.62, -12530.1, 7, 6, 0, "Semid");
-            player->SEND_GOSSIP_MENU(10081,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4149.62, -12530.1, 7, 6, 0, "Semid");
+            pPlayer->SEND_GOSSIP_MENU(10081,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Paladin
-            player->SEND_POI(-4138.98, -12468.5, 7, 6, 0, "Tullas");
-            player->SEND_GOSSIP_MENU(10083,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4138.98, -12468.5, 7, 6, 0, "Tullas");
+            pPlayer->SEND_GOSSIP_MENU(10083,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Priest
-            player->SEND_POI(-4131.66, -12478.6, 7, 6, 0, "Guvan");
-            player->SEND_GOSSIP_MENU(10084,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4131.66, -12478.6, 7, 6, 0, "Guvan");
+            pPlayer->SEND_GOSSIP_MENU(10084,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Shaman
-            player->SEND_POI(-4162.33, -12456.1, 7, 6, 0, "Tuluun");
-            player->SEND_GOSSIP_MENU(10085,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4162.33, -12456.1, 7, 6, 0, "Tuluun");
+            pPlayer->SEND_GOSSIP_MENU(10085,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Warrior
-            player->SEND_POI(-4165.05, -12536.4, 7, 6, 0, "Ruada");
-            player->SEND_GOSSIP_MENU(10086,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4165.05, -12536.4, 7, 6, 0, "Ruada");
+            pPlayer->SEND_GOSSIP_MENU(10086,_Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_azuremyst(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_azuremyst(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(-4191.15, -12470, 7, 6, 0, "Daedal");
-            player->SEND_GOSSIP_MENU(10088,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4191.15, -12470, 7, 6, 0, "Daedal");
+            pPlayer->SEND_GOSSIP_MENU(10088,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(-4726.29, -12387, 7, 6, 0, "Blacksmith Calypso");
-            player->SEND_GOSSIP_MENU(10089,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4726.29, -12387, 7, 6, 0, "Blacksmith Calypso");
+            pPlayer->SEND_GOSSIP_MENU(10089,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(-4710.87, -12400.6, 7, 6, 0, "'Cookie' McWeaksauce");
-            player->SEND_GOSSIP_MENU(10090,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4710.87, -12400.6, 7, 6, 0, "'Cookie' McWeaksauce");
+            pPlayer->SEND_GOSSIP_MENU(10090,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_POI(-3882.85, -11496.7, 7, 6, 0, "Nahogg");
-            player->SEND_GOSSIP_MENU(10091,_Creature->GetGUID());
+            pPlayer->SEND_POI(-3882.85, -11496.7, 7, 6, 0, "Nahogg");
+            pPlayer->SEND_GOSSIP_MENU(10091,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Engineering
-            player->SEND_POI(-4157.57, -12470.2, 7, 6, 0, "Artificer Daelo");
-            player->SEND_GOSSIP_MENU(10092,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4157.57, -12470.2, 7, 6, 0, "Artificer Daelo");
+            pPlayer->SEND_GOSSIP_MENU(10092,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //First Aid
-            player->SEND_POI(-4199.11, -12469.9, 7, 6, 0, "Anchorite Fateema");
-            player->SEND_GOSSIP_MENU(10093,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4199.11, -12469.9, 7, 6, 0, "Anchorite Fateema");
+            pPlayer->SEND_GOSSIP_MENU(10093,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Fishing
-            player->SEND_POI(-4266.38, -12985.1, 7, 6, 0, "Diktynna");
-            player->SEND_GOSSIP_MENU(10094,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4266.38, -12985.1, 7, 6, 0, "Diktynna");
+            pPlayer->SEND_GOSSIP_MENU(10094,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Herbalism
-            player->SEND_GOSSIP_MENU(10095,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(10095,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Jewelcrafting
-            player->SEND_POI(-3781.55, -11541.8, 7, 6, 0, "Farii");
-            player->SEND_GOSSIP_MENU(10096,_Creature->GetGUID());
+            pPlayer->SEND_POI(-3781.55, -11541.8, 7, 6, 0, "Farii");
+            pPlayer->SEND_GOSSIP_MENU(10096,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Leatherworking
-            player->SEND_POI(-3442.68, -12322.2, 7, 6, 0, "Moordo");
-            player->SEND_GOSSIP_MENU(10098,_Creature->GetGUID());
+            pPlayer->SEND_POI(-3442.68, -12322.2, 7, 6, 0, "Moordo");
+            pPlayer->SEND_GOSSIP_MENU(10098,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Mining
-            player->SEND_POI(-4179.89, -12493.1, 7, 6, 0, "Dulvi");
-            player->SEND_GOSSIP_MENU(10097,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4179.89, -12493.1, 7, 6, 0, "Dulvi");
+            pPlayer->SEND_GOSSIP_MENU(10097,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Skinning
-            player->SEND_POI(-3431.17, -12316.5, 7, 6, 0, "Gurf");
-            player->SEND_GOSSIP_MENU(10098,_Creature->GetGUID());
+            pPlayer->SEND_POI(-3431.17, -12316.5, 7, 6, 0, "Gurf");
+            pPlayer->SEND_GOSSIP_MENU(10098,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 13:                   //Tailoring
-            player->SEND_POI(-4711.54, -12386.7, 7, 6, 0, "Erin Kelly");
-            player->SEND_GOSSIP_MENU(10099,_Creature->GetGUID());
+            pPlayer->SEND_POI(-4711.54, -12386.7, 7, 6, 0, "Erin Kelly");
+            pPlayer->SEND_GOSSIP_MENU(10099,_Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_azuremyst(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_azuremyst(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_azuremyst(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_azuremyst(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_azuremyst(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_azuremyst(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_azuremyst(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_azuremyst(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -266,200 +266,200 @@ CreatureAI* GetAI_guard_azuremyst(Creature *_Creature)
  * guard_bluffwatcher start
  *******************************************************/
 
-bool GossipHello_guard_bluffwatcher(Player *player, Creature *_Creature)
-{
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-    player->SEND_GOSSIP_MENU(3543,_Creature->GetGUID());
+bool GossipHello_guard_bluffwatcher(Player* pPlayer, Creature *_Creature)
+{
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+    pPlayer->SEND_GOSSIP_MENU(3543,_Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_bluffwatcher(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_bluffwatcher(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Bank
-            player->SEND_POI(-1257.8, 24.14, 7, 6, 0, "Thunder Bluff Bank");
-            player->SEND_GOSSIP_MENU(1292,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1257.8, 24.14, 7, 6, 0, "Thunder Bluff Bank");
+            pPlayer->SEND_GOSSIP_MENU(1292,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Wind master
-            player->SEND_POI(-1196.43, 28.26, 7, 6, 0, "Wind Rider Roost");
-            player->SEND_GOSSIP_MENU(1293,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1196.43, 28.26, 7, 6, 0, "Wind Rider Roost");
+            pPlayer->SEND_GOSSIP_MENU(1293,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Guild master
-            player->SEND_POI(-1296.5, 127.57, 7, 6, 0, "Thunder Bluff Civic Information");
-            player->SEND_GOSSIP_MENU(1291,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1296.5, 127.57, 7, 6, 0, "Thunder Bluff Civic Information");
+            pPlayer->SEND_GOSSIP_MENU(1291,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Inn
-            player->SEND_POI(-1296, 39.7, 7, 6, 0, "Thunder Bluff Inn");
-            player->SEND_GOSSIP_MENU(3153,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1296, 39.7, 7, 6, 0, "Thunder Bluff Inn");
+            pPlayer->SEND_GOSSIP_MENU(3153,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Mailbox
-            player->SEND_POI(-1263.59, 44.36, 7, 6, 0, "Thunder Bluff Mailbox");
-            player->SEND_GOSSIP_MENU(3154,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1263.59, 44.36, 7, 6, 0, "Thunder Bluff Mailbox");
+            pPlayer->SEND_GOSSIP_MENU(3154,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Auction House
-            player->SEND_POI(1381.77, -4371.16, 7, 6, 0, GOSSIP_TEXT_AUCTIONHOUSE);
-            player->SEND_GOSSIP_MENU(3155,_Creature->GetGUID());
+            pPlayer->SEND_POI(1381.77, -4371.16, 7, 6, 0, GOSSIP_TEXT_AUCTIONHOUSE);
+            pPlayer->SEND_GOSSIP_MENU(3155,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Weapon master
-            player->SEND_POI(-1282.31, 89.56, 7, 6, 0, "Ansekhwa");
-            player->SEND_GOSSIP_MENU(4520,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1282.31, 89.56, 7, 6, 0, "Ansekhwa");
+            pPlayer->SEND_GOSSIP_MENU(4520,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Stable master
-            player->SEND_POI(-1270.19, 48.84, 7, 6, 0, "Bulrug");
-            player->SEND_GOSSIP_MENU(5977,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1270.19, 48.84, 7, 6, 0, "Bulrug");
+            pPlayer->SEND_GOSSIP_MENU(5977,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //battlemaster
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY       , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN         , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH         , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(7527,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY       , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN         , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH         , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(7527,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->SEND_GOSSIP_MENU(3542,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->SEND_GOSSIP_MENU(3542,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->SEND_GOSSIP_MENU(3541,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->SEND_GOSSIP_MENU(3541,_Creature->GetGUID());
             break;
     }
 }
 
-void SendBattleMasterMenu_guard_bluffwatcher(Player *player, Creature *_Creature, uint32 action)
+void SendBattleMasterMenu_guard_bluffwatcher(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //AV
-            player->SEND_POI(-1387.82, -97.55, 7, 6, 0, "Taim Ragetotem");
-            player->SEND_GOSSIP_MENU(7522,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1387.82, -97.55, 7, 6, 0, "Taim Ragetotem");
+            pPlayer->SEND_GOSSIP_MENU(7522,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //AB
-            player->SEND_POI(-997, 214.12, 7, 6, 0, "Martin Lindsey");
-            player->SEND_GOSSIP_MENU(7648,_Creature->GetGUID());
+            pPlayer->SEND_POI(-997, 214.12, 7, 6, 0, "Martin Lindsey");
+            pPlayer->SEND_GOSSIP_MENU(7648,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //WSG
-            player->SEND_POI(-1384.94, -75.91, 7, 6, 0, "Kergul Bloodaxe");
-            player->SEND_GOSSIP_MENU(7523,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1384.94, -75.91, 7, 6, 0, "Kergul Bloodaxe");
+            pPlayer->SEND_GOSSIP_MENU(7523,_Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_bluffwatcher(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_bluffwatcher(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Druid
-            player->SEND_POI(-1054.47, -285, 7, 6, 0, "Hall of Elders");
-            player->SEND_GOSSIP_MENU(1294,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1054.47, -285, 7, 6, 0, "Hall of Elders");
+            pPlayer->SEND_GOSSIP_MENU(1294,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Hunter
-            player->SEND_POI(-1416.32, -114.28, 7, 6, 0, "Hunter's Hall");
-            player->SEND_GOSSIP_MENU(1295,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1416.32, -114.28, 7, 6, 0, "Hunter's Hall");
+            pPlayer->SEND_GOSSIP_MENU(1295,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Mage
-            player->SEND_POI(-1061.2, 195.5, 7, 6, 0, "Pools of Vision");
-            player->SEND_GOSSIP_MENU(1296,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1061.2, 195.5, 7, 6, 0, "Pools of Vision");
+            pPlayer->SEND_GOSSIP_MENU(1296,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Priest
-            player->SEND_POI(-1061.2, 195.5, 7, 6, 0, "Pools of Vision");
-            player->SEND_GOSSIP_MENU(1297,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1061.2, 195.5, 7, 6, 0, "Pools of Vision");
+            pPlayer->SEND_GOSSIP_MENU(1297,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Shaman
-            player->SEND_POI(-989.54, 278.25, 7, 6, 0, "Hall of Spirits");
-            player->SEND_GOSSIP_MENU(1298,_Creature->GetGUID());
+            pPlayer->SEND_POI(-989.54, 278.25, 7, 6, 0, "Hall of Spirits");
+            pPlayer->SEND_GOSSIP_MENU(1298,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Warrior
-            player->SEND_POI(-1416.32, -114.28, 7, 6, 0, "Hunter's Hall");
-            player->SEND_GOSSIP_MENU(1299,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1416.32, -114.28, 7, 6, 0, "Hunter's Hall");
+            pPlayer->SEND_GOSSIP_MENU(1299,_Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_bluffwatcher(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_bluffwatcher(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(-1085.56, 27.29, 7, 6, 0, "Bena's Alchemy");
-            player->SEND_GOSSIP_MENU(1332,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1085.56, 27.29, 7, 6, 0, "Bena's Alchemy");
+            pPlayer->SEND_GOSSIP_MENU(1332,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(-1239.75, 104.88, 7, 6, 0, "Karn's Smithy");
-            player->SEND_GOSSIP_MENU(1333,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1239.75, 104.88, 7, 6, 0, "Karn's Smithy");
+            pPlayer->SEND_GOSSIP_MENU(1333,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(-1214.5, -21.23, 7, 6, 0, "Aska's Kitchen");
-            player->SEND_GOSSIP_MENU(1334,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1214.5, -21.23, 7, 6, 0, "Aska's Kitchen");
+            pPlayer->SEND_GOSSIP_MENU(1334,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_POI(-1112.65, 48.26, 7, 6, 0, "Dawnstrider Enchanters");
-            player->SEND_GOSSIP_MENU(1335,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1112.65, 48.26, 7, 6, 0, "Dawnstrider Enchanters");
+            pPlayer->SEND_GOSSIP_MENU(1335,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //First Aid
-            player->SEND_POI(-996.58, 200.5, 7, 6, 0, "Spiritual Healing");
-            player->SEND_GOSSIP_MENU(1336,_Creature->GetGUID());
+            pPlayer->SEND_POI(-996.58, 200.5, 7, 6, 0, "Spiritual Healing");
+            pPlayer->SEND_GOSSIP_MENU(1336,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Fishing
-            player->SEND_POI(-1169.35, -68.87, 7, 6, 0, "Mountaintop Bait & Tackle");
-            player->SEND_GOSSIP_MENU(1337,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1169.35, -68.87, 7, 6, 0, "Mountaintop Bait & Tackle");
+            pPlayer->SEND_GOSSIP_MENU(1337,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Herbalism
-            player->SEND_POI(-1137.7, -1.51, 7, 6, 0, "Holistic Herbalism");
-            player->SEND_GOSSIP_MENU(1338,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1137.7, -1.51, 7, 6, 0, "Holistic Herbalism");
+            pPlayer->SEND_GOSSIP_MENU(1338,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Leatherworking
-            player->SEND_POI(-1156.22, 66.86, 7, 6, 0, "Thunder Bluff Armorers");
-            player->SEND_GOSSIP_MENU(1339,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1156.22, 66.86, 7, 6, 0, "Thunder Bluff Armorers");
+            pPlayer->SEND_GOSSIP_MENU(1339,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Mining
-            player->SEND_POI(-1249.17, 155, 7, 6, 0, "Stonehoof Geology");
-            player->SEND_GOSSIP_MENU(1340,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1249.17, 155, 7, 6, 0, "Stonehoof Geology");
+            pPlayer->SEND_GOSSIP_MENU(1340,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Skinning
-            player->SEND_POI(-1148.56, 51.18, 7, 6, 0, "Mooranta");
-            player->SEND_GOSSIP_MENU(1343,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1148.56, 51.18, 7, 6, 0, "Mooranta");
+            pPlayer->SEND_GOSSIP_MENU(1343,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Tailoring
-            player->SEND_POI(-1156.22, 66.86, 7, 6, 0, "Thunder Bluff Armorers");
-            player->SEND_GOSSIP_MENU(1341,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1156.22, 66.86, 7, 6, 0, "Thunder Bluff Armorers");
+            pPlayer->SEND_GOSSIP_MENU(1341,_Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_bluffwatcher(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_bluffwatcher(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_bluffwatcher(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_bluffwatcher(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_bluffwatcher(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_bluffwatcher(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_bluffwatcher(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_bluffwatcher(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_bluffwatcher(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_bluffwatcher(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -489,185 +489,185 @@ CreatureAI* GetAI_guard_contested(Creature *_Creature)
  * guard_darnassus start
  *******************************************************/
 
-bool GossipHello_guard_darnassus(Player *player, Creature *_Creature)
-{
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HIPPOGRYPH     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN            , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-    player->SEND_GOSSIP_MENU(3016, _Creature->GetGUID());
+bool GossipHello_guard_darnassus(Player* pPlayer, Creature *_Creature)
+{
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HIPPOGRYPH     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN            , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+    pPlayer->SEND_GOSSIP_MENU(3016, _Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_darnassus(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_darnassus(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Auction house
-            player->SEND_POI(9861.23, 2334.55, 7, 6, 0, "Darnassus Auction House");
-            player->SEND_GOSSIP_MENU(3833, _Creature->GetGUID());
+            pPlayer->SEND_POI(9861.23, 2334.55, 7, 6, 0, "Darnassus Auction House");
+            pPlayer->SEND_GOSSIP_MENU(3833, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Bank
-            player->SEND_POI(9938.45, 2512.35, 7, 6, 0, "Darnassus Bank");
-            player->SEND_GOSSIP_MENU(3017, _Creature->GetGUID());
+            pPlayer->SEND_POI(9938.45, 2512.35, 7, 6, 0, "Darnassus Bank");
+            pPlayer->SEND_GOSSIP_MENU(3017, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Wind master
-            player->SEND_POI(9945.65, 2618.94, 7, 6, 0, "Rut'theran Village");
-            player->SEND_GOSSIP_MENU(3018, _Creature->GetGUID());
+            pPlayer->SEND_POI(9945.65, 2618.94, 7, 6, 0, "Rut'theran Village");
+            pPlayer->SEND_GOSSIP_MENU(3018, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Guild master
-            player->SEND_POI(10076.40, 2199.59, 7, 6, 0, "Darnassus Guild Master");
-            player->SEND_GOSSIP_MENU(3019, _Creature->GetGUID());
+            pPlayer->SEND_POI(10076.40, 2199.59, 7, 6, 0, "Darnassus Guild Master");
+            pPlayer->SEND_GOSSIP_MENU(3019, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Inn
-            player->SEND_POI(10133.29, 2222.52, 7, 6, 0, "Darnassus Inn");
-            player->SEND_GOSSIP_MENU(3020, _Creature->GetGUID());
+            pPlayer->SEND_POI(10133.29, 2222.52, 7, 6, 0, "Darnassus Inn");
+            pPlayer->SEND_GOSSIP_MENU(3020, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Mailbox
-            player->SEND_POI(9942.17, 2495.48, 7, 6, 0, "Darnassus Mailbox");
-            player->SEND_GOSSIP_MENU(3021, _Creature->GetGUID());
+            pPlayer->SEND_POI(9942.17, 2495.48, 7, 6, 0, "Darnassus Mailbox");
+            pPlayer->SEND_GOSSIP_MENU(3021, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Stable master
-            player->SEND_POI(10167.20, 2522.66, 7, 6, 0, "Alassin");
-            player->SEND_GOSSIP_MENU(5980, _Creature->GetGUID());
+            pPlayer->SEND_POI(10167.20, 2522.66, 7, 6, 0, "Alassin");
+            pPlayer->SEND_GOSSIP_MENU(5980, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Weapon trainer
-            player->SEND_POI(9907.11, 2329.70, 7, 6, 0, "Ilyenia Moonfire");
-            player->SEND_GOSSIP_MENU(4517, _Creature->GetGUID());
+            pPlayer->SEND_POI(9907.11, 2329.70, 7, 6, 0, "Ilyenia Moonfire");
+            pPlayer->SEND_GOSSIP_MENU(4517, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Battlemaster
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY   , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(7519, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY   , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(7519, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID           , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE           , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->SEND_GOSSIP_MENU(4264, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID           , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE           , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(4264, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING  , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->SEND_GOSSIP_MENU(4273, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING  , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->SEND_GOSSIP_MENU(4273, _Creature->GetGUID());
             break;
     }
 }
 
-void SendBattleMasterMenu_guard_darnassus(Player *player, Creature *_Creature, uint32 action)
+void SendBattleMasterMenu_guard_darnassus(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //AV
-            player->SEND_POI(9923.61, 2327.43, 7, 6, 0, "Brogun Stoneshield");
-            player->SEND_GOSSIP_MENU(7518, _Creature->GetGUID());
+            pPlayer->SEND_POI(9923.61, 2327.43, 7, 6, 0, "Brogun Stoneshield");
+            pPlayer->SEND_GOSSIP_MENU(7518, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //AB
-            player->SEND_POI(9977.37, 2324.39, 7, 6, 0, "Keras Wolfheart");
-            player->SEND_GOSSIP_MENU(7651,  _Creature->GetGUID());
+            pPlayer->SEND_POI(9977.37, 2324.39, 7, 6, 0, "Keras Wolfheart");
+            pPlayer->SEND_GOSSIP_MENU(7651,  _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //WSG
-            player->SEND_POI(9979.84, 2315.79, 7, 6, 0, "Aethalas");
-            player->SEND_GOSSIP_MENU(7482, _Creature->GetGUID());
+            pPlayer->SEND_POI(9979.84, 2315.79, 7, 6, 0, "Aethalas");
+            pPlayer->SEND_GOSSIP_MENU(7482, _Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_darnassus(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_darnassus(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Druid
-            player->SEND_POI(10186, 2570.46, 7, 6, 0, "Darnassus Druid Trainer");
-            player->SEND_GOSSIP_MENU(3024, _Creature->GetGUID());
+            pPlayer->SEND_POI(10186, 2570.46, 7, 6, 0, "Darnassus Druid Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3024, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Hunter
-            player->SEND_POI(10177.29, 2511.10, 7, 6, 0, "Darnassus Hunter Trainer");
-            player->SEND_GOSSIP_MENU(3023, _Creature->GetGUID());
+            pPlayer->SEND_POI(10177.29, 2511.10, 7, 6, 0, "Darnassus Hunter Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3023, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Priest
-            player->SEND_POI(9659.12, 2524.88, 7, 6, 0, "Temple of the Moon");
-            player->SEND_GOSSIP_MENU(3025, _Creature->GetGUID());
+            pPlayer->SEND_POI(9659.12, 2524.88, 7, 6, 0, "Temple of the Moon");
+            pPlayer->SEND_GOSSIP_MENU(3025, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Rogue
-            player->SEND_POI(10122, 2599.12, 7, 6, 0, "Darnassus Rogue Trainer");
-            player->SEND_GOSSIP_MENU(3026, _Creature->GetGUID());
+            pPlayer->SEND_POI(10122, 2599.12, 7, 6, 0, "Darnassus Rogue Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3026, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Warrior
-            player->SEND_POI(9951.91, 2280.38, 7, 6, 0, "Warrior's Terrace");
-            player->SEND_GOSSIP_MENU(3033, _Creature->GetGUID());
+            pPlayer->SEND_POI(9951.91, 2280.38, 7, 6, 0, "Warrior's Terrace");
+            pPlayer->SEND_GOSSIP_MENU(3033, _Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_darnassus(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_darnassus(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(10075.90, 2356.76, 7, 6, 0, "Darnassus Alchemy Trainer");
-            player->SEND_GOSSIP_MENU(3035, _Creature->GetGUID());
+            pPlayer->SEND_POI(10075.90, 2356.76, 7, 6, 0, "Darnassus Alchemy Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3035, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Cooking
-            player->SEND_POI(10088.59, 2419.21, 7, 6, 0, "Darnassus Cooking Trainer");
-            player->SEND_GOSSIP_MENU(3036, _Creature->GetGUID());
+            pPlayer->SEND_POI(10088.59, 2419.21, 7, 6, 0, "Darnassus Cooking Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3036, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Enchanting
-            player->SEND_POI(10146.09, 2313.42, 7, 6, 0, "Darnassus Enchanting Trainer");
-            player->SEND_GOSSIP_MENU(3337, _Creature->GetGUID());
+            pPlayer->SEND_POI(10146.09, 2313.42, 7, 6, 0, "Darnassus Enchanting Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3337, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //First Aid
-            player->SEND_POI(10150.09, 2390.43, 7, 6, 0, "Darnassus First Aid Trainer");
-            player->SEND_GOSSIP_MENU(3037, _Creature->GetGUID());
+            pPlayer->SEND_POI(10150.09, 2390.43, 7, 6, 0, "Darnassus First Aid Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3037, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Fishing
-            player->SEND_POI(9836.20, 2432.17, 7, 6, 0, "Darnassus Fishing Trainer");
-            player->SEND_GOSSIP_MENU(3038, _Creature->GetGUID());
+            pPlayer->SEND_POI(9836.20, 2432.17, 7, 6, 0, "Darnassus Fishing Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3038, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Herbalism
-            player->SEND_POI(9757.17, 2430.16, 7, 6, 0, "Darnassus Herbalism Trainer");
-            player->SEND_GOSSIP_MENU(3039, _Creature->GetGUID());
+            pPlayer->SEND_POI(9757.17, 2430.16, 7, 6, 0, "Darnassus Herbalism Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3039, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Leatherworking
-            player->SEND_POI(10086.59, 2255.77, 7, 6, 0, "Darnassus Leatherworking Trainer");
-            player->SEND_GOSSIP_MENU(3040, _Creature->GetGUID());
+            pPlayer->SEND_POI(10086.59, 2255.77, 7, 6, 0, "Darnassus Leatherworking Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3040, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Skinning
-            player->SEND_POI(10081.40, 2257.18, 7, 6, 0, "Darnassus Skinning Trainer");
-            player->SEND_GOSSIP_MENU(3042, _Creature->GetGUID());
+            pPlayer->SEND_POI(10081.40, 2257.18, 7, 6, 0, "Darnassus Skinning Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3042, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Tailoring
-            player->SEND_POI(10079.70, 2268.19, 7, 6, 0, "Darnassus Tailor");
-            player->SEND_GOSSIP_MENU(3044, _Creature->GetGUID());
+            pPlayer->SEND_POI(10079.70, 2268.19, 7, 6, 0, "Darnassus Tailor");
+            pPlayer->SEND_GOSSIP_MENU(3044, _Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_darnassus(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_darnassus(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_darnassus(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_darnassus(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_darnassus(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_darnassus(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_darnassus(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_darnassus(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_darnassus(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_darnassus(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -685,160 +685,160 @@ CreatureAI* GetAI_guard_darnassus(Creature *_Creature)
  * guard_dunmorogh start
  *******************************************************/
 
-bool GossipHello_guard_dunmorogh(Player *player, Creature *_Creature)
+bool GossipHello_guard_dunmorogh(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK             , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HIPPOGRYPH       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN              , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->SEND_GOSSIP_MENU(4287,_Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK             , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HIPPOGRYPH       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN              , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->SEND_GOSSIP_MENU(4287,_Creature->GetGUID());
 
     return true;
 }
 
-void SendDefaultMenu_guard_dunmorogh(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_dunmorogh(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Bank
-            player->SEND_GOSSIP_MENU(4288,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4288,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Gryphon master
-            player->SEND_GOSSIP_MENU(4289,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4289,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Guild master
-            player->SEND_GOSSIP_MENU(4290,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4290,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Inn
-            player->SEND_POI(-5582.66, -525.89, 7, 6, 0, "Thunderbrew Distillery");
-            player->SEND_GOSSIP_MENU(4291,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5582.66, -525.89, 7, 6, 0, "Thunderbrew Distillery");
+            pPlayer->SEND_GOSSIP_MENU(4291,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Stable Master
-            player->SEND_POI(-5604, -509.58, 7, 6, 0, "Shelby Stoneflint");
-            player->SEND_GOSSIP_MENU(5985,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5604, -509.58, 7, 6, 0, "Shelby Stoneflint");
+            pPlayer->SEND_GOSSIP_MENU(5985,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                 , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->SEND_GOSSIP_MENU(4292,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                 , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(4292,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING               , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->SEND_GOSSIP_MENU(4300,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING               , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->SEND_GOSSIP_MENU(4300,_Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_dunmorogh(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_dunmorogh(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Hunter
-            player->SEND_POI(-5618.29, -454.25, 7, 6, 0, "Grif Wildheart");
-            player->SEND_GOSSIP_MENU(4293,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5618.29, -454.25, 7, 6, 0, "Grif Wildheart");
+            pPlayer->SEND_GOSSIP_MENU(4293,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Mage
-            player->SEND_POI(-5585.6, -539.99, 7, 6, 0, "Magis Sparkmantle");
-            player->SEND_GOSSIP_MENU(4294,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5585.6, -539.99, 7, 6, 0, "Magis Sparkmantle");
+            pPlayer->SEND_GOSSIP_MENU(4294,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Paladin
-            player->SEND_POI(-5585.6, -539.99, 7, 6, 0, "Azar Stronghammer");
-            player->SEND_GOSSIP_MENU(4295,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5585.6, -539.99, 7, 6, 0, "Azar Stronghammer");
+            pPlayer->SEND_GOSSIP_MENU(4295,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Priest
-            player->SEND_POI(-5591.74, -525.61, 7, 6, 0, "Maxan Anvol");
-            player->SEND_GOSSIP_MENU(4296,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5591.74, -525.61, 7, 6, 0, "Maxan Anvol");
+            pPlayer->SEND_GOSSIP_MENU(4296,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Rogue
-            player->SEND_POI(-5602.75, -542.4, 7, 6, 0, "Hogral Bakkan");
-            player->SEND_GOSSIP_MENU(4297,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5602.75, -542.4, 7, 6, 0, "Hogral Bakkan");
+            pPlayer->SEND_GOSSIP_MENU(4297,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Warlock
-            player->SEND_POI(-5641.97, -523.76, 7, 6, 0, "Gimrizz Shadowcog");
-            player->SEND_GOSSIP_MENU(4298,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5641.97, -523.76, 7, 6, 0, "Gimrizz Shadowcog");
+            pPlayer->SEND_GOSSIP_MENU(4298,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Warrior
-            player->SEND_POI(-5604.79, -529.38, 7, 6, 0, "Granis Swiftaxe");
-            player->SEND_GOSSIP_MENU(4299,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5604.79, -529.38, 7, 6, 0, "Granis Swiftaxe");
+            pPlayer->SEND_GOSSIP_MENU(4299,_Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_dunmorogh(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_dunmorogh(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_GOSSIP_MENU(4301,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4301,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(-5584.72, -428.41, 7, 6, 0, "Tognus Flintfire");
-            player->SEND_GOSSIP_MENU(4302,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5584.72, -428.41, 7, 6, 0, "Tognus Flintfire");
+            pPlayer->SEND_GOSSIP_MENU(4302,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(-5596.85, -541.43, 7, 6, 0, "Gremlock Pilsnor");
-            player->SEND_GOSSIP_MENU(4303,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5596.85, -541.43, 7, 6, 0, "Gremlock Pilsnor");
+            pPlayer->SEND_GOSSIP_MENU(4303,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_GOSSIP_MENU(4304,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4304,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Engineering
-            player->SEND_POI(-5531, -666.53, 7, 6, 0, "Bronk Guzzlegear");
-            player->SEND_GOSSIP_MENU(4305,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5531, -666.53, 7, 6, 0, "Bronk Guzzlegear");
+            pPlayer->SEND_GOSSIP_MENU(4305,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //First Aid
-            player->SEND_POI(-5603.67, -523.57, 7, 6, 0, "Thamner Pol");
-            player->SEND_GOSSIP_MENU(4306,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5603.67, -523.57, 7, 6, 0, "Thamner Pol");
+            pPlayer->SEND_GOSSIP_MENU(4306,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Fishing
-            player->SEND_POI(-5199.9, 58.58, 7, 6, 0, "Paxton Ganter");
-            player->SEND_GOSSIP_MENU(4307,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5199.9, 58.58, 7, 6, 0, "Paxton Ganter");
+            pPlayer->SEND_GOSSIP_MENU(4307,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Herbalism
-            player->SEND_GOSSIP_MENU(4308,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4308,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Leatherworking
-            player->SEND_GOSSIP_MENU(4310,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4310,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Mining
-            player->SEND_POI(-5531, -666.53, 7, 6, 0, "Yarr Hamerstone");
-            player->SEND_GOSSIP_MENU(4311,_Creature->GetGUID());
+            pPlayer->SEND_POI(-5531, -666.53, 7, 6, 0, "Yarr Hamerstone");
+            pPlayer->SEND_GOSSIP_MENU(4311,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Skinning
-            player->SEND_GOSSIP_MENU(4312,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4312,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Tailoring
-            player->SEND_GOSSIP_MENU(4313,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4313,_Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_dunmorogh(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_dunmorogh(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_dunmorogh(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_dunmorogh(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_dunmorogh(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_dunmorogh(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_dunmorogh(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_dunmorogh(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -856,156 +856,156 @@ CreatureAI* GetAI_guard_dunmorogh(Creature *_Creature)
  * guard_durotar start
  *******************************************************/
 
-bool GossipHello_guard_durotar(Player *player, Creature *_Creature)
+bool GossipHello_guard_durotar(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->SEND_GOSSIP_MENU(4037,_Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->SEND_GOSSIP_MENU(4037,_Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_durotar(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_durotar(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Bank
-            player->SEND_GOSSIP_MENU(4032,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4032,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Wind rider
-            player->SEND_GOSSIP_MENU(4033,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4033,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Inn
-            player->SEND_POI(338.7, -4688.87, 7, 6, 0, "Razor Hill Inn");
-            player->SEND_GOSSIP_MENU(4034,_Creature->GetGUID());
+            pPlayer->SEND_POI(338.7, -4688.87, 7, 6, 0, "Razor Hill Inn");
+            pPlayer->SEND_GOSSIP_MENU(4034,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Stable master
-            player->SEND_POI(330.31, -4710.66, 7, 6, 0, "Shoja'my");
-            player->SEND_GOSSIP_MENU(5973,_Creature->GetGUID());
+            pPlayer->SEND_POI(330.31, -4710.66, 7, 6, 0, "Shoja'my");
+            pPlayer->SEND_GOSSIP_MENU(5973,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->SEND_GOSSIP_MENU(4035,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(4035,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->SEND_GOSSIP_MENU(4036,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->SEND_GOSSIP_MENU(4036,_Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_durotar(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_durotar(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Hunter
-            player->SEND_POI(276, -4706.72, 7, 6, 0, "Thotar");
-            player->SEND_GOSSIP_MENU(4013,_Creature->GetGUID());
+            pPlayer->SEND_POI(276, -4706.72, 7, 6, 0, "Thotar");
+            pPlayer->SEND_GOSSIP_MENU(4013,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Mage
-            player->SEND_POI(-839.33, -4935.6, 7, 6, 0, "Un'Thuwa");
-            player->SEND_GOSSIP_MENU(4014,_Creature->GetGUID());
+            pPlayer->SEND_POI(-839.33, -4935.6, 7, 6, 0, "Un'Thuwa");
+            pPlayer->SEND_GOSSIP_MENU(4014,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Priest
-            player->SEND_POI(296.22, -4828.1, 7, 6, 0, "Tai'jin");
-            player->SEND_GOSSIP_MENU(4015,_Creature->GetGUID());
+            pPlayer->SEND_POI(296.22, -4828.1, 7, 6, 0, "Tai'jin");
+            pPlayer->SEND_GOSSIP_MENU(4015,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Rogue
-            player->SEND_POI(265.76, -4709, 7, 6, 0, "Kaplak");
-            player->SEND_GOSSIP_MENU(4016,_Creature->GetGUID());
+            pPlayer->SEND_POI(265.76, -4709, 7, 6, 0, "Kaplak");
+            pPlayer->SEND_GOSSIP_MENU(4016,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Shaman
-            player->SEND_POI(307.79, -4836.97, 7, 6, 0, "Swart");
-            player->SEND_GOSSIP_MENU(4017,_Creature->GetGUID());
+            pPlayer->SEND_POI(307.79, -4836.97, 7, 6, 0, "Swart");
+            pPlayer->SEND_GOSSIP_MENU(4017,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Warlock
-            player->SEND_POI(355.88, -4836.45, 7, 6, 0, "Dhugru Gorelust");
-            player->SEND_GOSSIP_MENU(4018,_Creature->GetGUID());
+            pPlayer->SEND_POI(355.88, -4836.45, 7, 6, 0, "Dhugru Gorelust");
+            pPlayer->SEND_GOSSIP_MENU(4018,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Warrior
-            player->SEND_POI(312.3, -4824.66, 7, 6, 0, "Tarshaw Jaggedscar");
-            player->SEND_GOSSIP_MENU(4019,_Creature->GetGUID());
+            pPlayer->SEND_POI(312.3, -4824.66, 7, 6, 0, "Tarshaw Jaggedscar");
+            pPlayer->SEND_GOSSIP_MENU(4019,_Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_durotar(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_durotar(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(-800.25, -4894.33, 7, 6, 0, "Miao'zan");
-            player->SEND_GOSSIP_MENU(4020,_Creature->GetGUID());
+            pPlayer->SEND_POI(-800.25, -4894.33, 7, 6, 0, "Miao'zan");
+            pPlayer->SEND_GOSSIP_MENU(4020,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(373.24, -4716.45, 7, 6, 0, "Dwukk");
-            player->SEND_GOSSIP_MENU(4021,_Creature->GetGUID());
+            pPlayer->SEND_POI(373.24, -4716.45, 7, 6, 0, "Dwukk");
+            pPlayer->SEND_GOSSIP_MENU(4021,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_GOSSIP_MENU(4022,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4022,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_GOSSIP_MENU(4023,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4023,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Engineering
-            player->SEND_POI(368.95, -4723.95, 7, 6, 0, "Mukdrak");
-            player->SEND_GOSSIP_MENU(4024,_Creature->GetGUID());
+            pPlayer->SEND_POI(368.95, -4723.95, 7, 6, 0, "Mukdrak");
+            pPlayer->SEND_GOSSIP_MENU(4024,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //First Aid
-            player->SEND_POI(327.17, -4825.62, 7, 6, 0, "Rawrk");
-            player->SEND_GOSSIP_MENU(4025,_Creature->GetGUID());
+            pPlayer->SEND_POI(327.17, -4825.62, 7, 6, 0, "Rawrk");
+            pPlayer->SEND_GOSSIP_MENU(4025,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Fishing
-            player->SEND_POI(-1065.48, -4777.43, 7, 6, 0, "Lau'Tiki");
-            player->SEND_GOSSIP_MENU(4026,_Creature->GetGUID());
+            pPlayer->SEND_POI(-1065.48, -4777.43, 7, 6, 0, "Lau'Tiki");
+            pPlayer->SEND_GOSSIP_MENU(4026,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Herbalism
-            player->SEND_POI(-836.25, -4896.89, 7, 6, 0, "Mishiki");
-            player->SEND_GOSSIP_MENU(4027,_Creature->GetGUID());
+            pPlayer->SEND_POI(-836.25, -4896.89, 7, 6, 0, "Mishiki");
+            pPlayer->SEND_GOSSIP_MENU(4027,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Leatherworking
-            player->SEND_GOSSIP_MENU(4028,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4028,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Mining
-            player->SEND_POI(366.94, -4705, 7, 6, 0, "Krunn");
-            player->SEND_GOSSIP_MENU(4029,_Creature->GetGUID());
+            pPlayer->SEND_POI(366.94, -4705, 7, 6, 0, "Krunn");
+            pPlayer->SEND_GOSSIP_MENU(4029,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Skinning
-            player->SEND_GOSSIP_MENU(4030,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4030,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Tailoring
-            player->SEND_GOSSIP_MENU(4031,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4031,_Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_durotar(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_durotar(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_durotar(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_durotar(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_durotar(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_durotar(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_durotar(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_durotar(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -1023,165 +1023,165 @@ CreatureAI* GetAI_guard_durotar(Creature *_Creature)
  * guard_elwynnforest start
  *******************************************************/
 
-bool GossipHello_guard_elwynnforest(Player *player, Creature *_Creature)
+bool GossipHello_guard_elwynnforest(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GRYPHON       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->SEND_GOSSIP_MENU(933,_Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GRYPHON       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->SEND_GOSSIP_MENU(933,_Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_elwynnforest(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_elwynnforest(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Bank
-            player->SEND_GOSSIP_MENU(4260,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4260,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Gryphon master
-            player->SEND_GOSSIP_MENU(4261,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4261,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Guild master
-            player->SEND_GOSSIP_MENU(4262,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4262,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Inn
-            player->SEND_POI(-9459.34, 42.08, 7, 6, 0, "Lion's Pride Inn");
-            player->SEND_GOSSIP_MENU(4263,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9459.34, 42.08, 7, 6, 0, "Lion's Pride Inn");
+            pPlayer->SEND_GOSSIP_MENU(4263,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Stable Master
-            player->SEND_POI(-9466.62, 45.87, 7, 6, 0, "Erma");
-            player->SEND_GOSSIP_MENU(5983,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9466.62, 45.87, 7, 6, 0, "Erma");
+            pPlayer->SEND_GOSSIP_MENU(5983,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->SEND_GOSSIP_MENU(4264,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->SEND_GOSSIP_MENU(4264,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->SEND_GOSSIP_MENU(4273,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->SEND_GOSSIP_MENU(4273,_Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_elwynnforest(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_elwynnforest(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Druid
-            player->SEND_GOSSIP_MENU(4265,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4265,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Hunter
-            player->SEND_GOSSIP_MENU(4266,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4266,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Mage
-            player->SEND_POI(-9471.12, 33.44, 7, 6, 0, "Zaldimar Wefhellt");
-            player->SEND_GOSSIP_MENU(4268,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9471.12, 33.44, 7, 6, 0, "Zaldimar Wefhellt");
+            pPlayer->SEND_GOSSIP_MENU(4268,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Paladin
-            player->SEND_POI(-9469, 108.05, 7, 6, 0, "Brother Wilhelm");
-            player->SEND_GOSSIP_MENU(4269,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9469, 108.05, 7, 6, 0, "Brother Wilhelm");
+            pPlayer->SEND_GOSSIP_MENU(4269,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Priest
-            player->SEND_POI(-9461.07, 32.6, 7, 6, 0, "Priestess Josetta");
-            player->SEND_GOSSIP_MENU(4267,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9461.07, 32.6, 7, 6, 0, "Priestess Josetta");
+            pPlayer->SEND_GOSSIP_MENU(4267,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Rogue
-            player->SEND_POI(-9465.13, 13.29, 7, 6, 0, "Keryn Sylvius");
-            player->SEND_GOSSIP_MENU(4270,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9465.13, 13.29, 7, 6, 0, "Keryn Sylvius");
+            pPlayer->SEND_GOSSIP_MENU(4270,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Warlock
-            player->SEND_POI(-9473.21, -4.08, 7, 6, 0, "Maximillian Crowe");
-            player->SEND_GOSSIP_MENU(4272,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9473.21, -4.08, 7, 6, 0, "Maximillian Crowe");
+            pPlayer->SEND_GOSSIP_MENU(4272,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Warrior
-            player->SEND_POI(-9461.82, 109.50, 7, 6, 0, "Lyria Du Lac");
-            player->SEND_GOSSIP_MENU(4271,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9461.82, 109.50, 7, 6, 0, "Lyria Du Lac");
+            pPlayer->SEND_GOSSIP_MENU(4271,_Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_elwynnforest(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_elwynnforest(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(-9057.04, 153.63, 7, 6, 0, "Alchemist Mallory");
-            player->SEND_GOSSIP_MENU(4274,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9057.04, 153.63, 7, 6, 0, "Alchemist Mallory");
+            pPlayer->SEND_GOSSIP_MENU(4274,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(-9456.58, 87.90, 7, 6, 0, "Smith Argus");
-            player->SEND_GOSSIP_MENU(4275,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9456.58, 87.90, 7, 6, 0, "Smith Argus");
+            pPlayer->SEND_GOSSIP_MENU(4275,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(-9467.54, -3.16, 7, 6, 0, "Tomas");
-            player->SEND_GOSSIP_MENU(4276,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9467.54, -3.16, 7, 6, 0, "Tomas");
+            pPlayer->SEND_GOSSIP_MENU(4276,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_GOSSIP_MENU(4277,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4277,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Engineering
-            player->SEND_GOSSIP_MENU(4278,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4278,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //First Aid
-            player->SEND_POI(-9456.82, 30.49, 7, 6, 0, "Michelle Belle");
-            player->SEND_GOSSIP_MENU(4279,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9456.82, 30.49, 7, 6, 0, "Michelle Belle");
+            pPlayer->SEND_GOSSIP_MENU(4279,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Fishing
-            player->SEND_POI(-9386.54, -118.73, 7, 6, 0, "Lee Brown");
-            player->SEND_GOSSIP_MENU(4280,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9386.54, -118.73, 7, 6, 0, "Lee Brown");
+            pPlayer->SEND_GOSSIP_MENU(4280,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Herbalism
-            player->SEND_POI(-9060.70, 149.23, 7, 6, 0, "Herbalist Pomeroy");
-            player->SEND_GOSSIP_MENU(4281,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9060.70, 149.23, 7, 6, 0, "Herbalist Pomeroy");
+            pPlayer->SEND_GOSSIP_MENU(4281,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Leatherworking
-            player->SEND_POI(-9376.12, -75.23, 7, 6, 0, "Adele Fielder");
-            player->SEND_GOSSIP_MENU(4282,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9376.12, -75.23, 7, 6, 0, "Adele Fielder");
+            pPlayer->SEND_GOSSIP_MENU(4282,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Mining
-            player->SEND_GOSSIP_MENU(4283,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4283,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Skinning
-            player->SEND_POI(-9536.91, -1212.76, 7, 6, 0, "Helene Peltskinner");
-            player->SEND_GOSSIP_MENU(4284,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9536.91, -1212.76, 7, 6, 0, "Helene Peltskinner");
+            pPlayer->SEND_GOSSIP_MENU(4284,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Tailoring
-            player->SEND_POI(-9376.12, -75.23, 7, 6, 0, "Eldrin");
-            player->SEND_GOSSIP_MENU(4285,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9376.12, -75.23, 7, 6, 0, "Eldrin");
+            pPlayer->SEND_GOSSIP_MENU(4285,_Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_elwynnforest(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_elwynnforest(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_elwynnforest(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_elwynnforest(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_elwynnforest(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_elwynnforest(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_elwynnforest(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_elwynnforest(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -1199,158 +1199,158 @@ CreatureAI* GetAI_guard_elwynnforest(Creature *_Creature)
  * guard_eversong start
  *******************************************************/
 
-bool GossipHello_guard_eversong(Player *player, Creature *_Creature)
+bool GossipHello_guard_eversong(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATHANDLER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->SEND_GOSSIP_MENU(10180,_Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATHANDLER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->SEND_GOSSIP_MENU(10180,_Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_eversong(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_eversong(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Bat Handler
-            player->SEND_POI(9371.93, -7164.80, 7, 6, 0, "Skymistress Gloaming");
-            player->SEND_GOSSIP_MENU(10181,_Creature->GetGUID());
+            pPlayer->SEND_POI(9371.93, -7164.80, 7, 6, 0, "Skymistress Gloaming");
+            pPlayer->SEND_GOSSIP_MENU(10181,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Guild master
-            player->SEND_GOSSIP_MENU(10182,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(10182,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Inn
-            player->SEND_POI(9483.74, -6844.58, 7, 6, 0, "Delaniel's inn");
-            player->SEND_GOSSIP_MENU(10183,_Creature->GetGUID());
+            pPlayer->SEND_POI(9483.74, -6844.58, 7, 6, 0, "Delaniel's inn");
+            pPlayer->SEND_GOSSIP_MENU(10183,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Stable Master
-            player->SEND_POI(9489.62, -6829.93, 7, 6, 0, "Anathos");
-            player->SEND_GOSSIP_MENU(10184,_Creature->GetGUID());
+            pPlayer->SEND_POI(9489.62, -6829.93, 7, 6, 0, "Anathos");
+            pPlayer->SEND_GOSSIP_MENU(10184,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->SEND_GOSSIP_MENU(10180,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(10180,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->SEND_GOSSIP_MENU(10180,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->SEND_GOSSIP_MENU(10180,_Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_eversong(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_eversong(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Druid
-            player->SEND_GOSSIP_MENU(10185,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(10185,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Hunter
-            player->SEND_POI(9527.44, -6865.25, 7, 6, 0, "Hannovia");
-            player->SEND_GOSSIP_MENU(10186,_Creature->GetGUID());
+            pPlayer->SEND_POI(9527.44, -6865.25, 7, 6, 0, "Hannovia");
+            pPlayer->SEND_GOSSIP_MENU(10186,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Mage
-            player->SEND_POI(9464.24, -6855.52, 7, 6, 0, "Garridel");
-            player->SEND_GOSSIP_MENU(10187,_Creature->GetGUID());
+            pPlayer->SEND_POI(9464.24, -6855.52, 7, 6, 0, "Garridel");
+            pPlayer->SEND_GOSSIP_MENU(10187,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Paladin
-            player->SEND_POI(9517.61, -6871.04, 7, 6, 0, "Noellene");
-            player->SEND_GOSSIP_MENU(10189,_Creature->GetGUID());
+            pPlayer->SEND_POI(9517.61, -6871.04, 7, 6, 0, "Noellene");
+            pPlayer->SEND_GOSSIP_MENU(10189,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Priest
-            player->SEND_POI(9467.39, -6845.72, 7, 6, 0, "Ponaris");
-            player->SEND_GOSSIP_MENU(10190,_Creature->GetGUID());
+            pPlayer->SEND_POI(9467.39, -6845.72, 7, 6, 0, "Ponaris");
+            pPlayer->SEND_GOSSIP_MENU(10190,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Rogue
-            player->SEND_POI(9533.67, -6877.39, 7, 6, 0, "Tannaria");
-            player->SEND_GOSSIP_MENU(10191,_Creature->GetGUID());
+            pPlayer->SEND_POI(9533.67, -6877.39, 7, 6, 0, "Tannaria");
+            pPlayer->SEND_GOSSIP_MENU(10191,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Warlock
-            player->SEND_POI(9468.99, -6865.60, 7, 6, 0, "Celoenus");
-            player->SEND_GOSSIP_MENU(10192,_Creature->GetGUID());
+            pPlayer->SEND_POI(9468.99, -6865.60, 7, 6, 0, "Celoenus");
+            pPlayer->SEND_GOSSIP_MENU(10192,_Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_eversong(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_eversong(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(8659.90, -6368.12, 7, 6, 0, "Arcanist Sheynathren");
-            player->SEND_GOSSIP_MENU(10193,_Creature->GetGUID());
+            pPlayer->SEND_POI(8659.90, -6368.12, 7, 6, 0, "Arcanist Sheynathren");
+            pPlayer->SEND_GOSSIP_MENU(10193,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(8984.21, -7419.21, 7, 6, 0, "Arathel Sunforge");
-            player->SEND_GOSSIP_MENU(10194,_Creature->GetGUID());
+            pPlayer->SEND_POI(8984.21, -7419.21, 7, 6, 0, "Arathel Sunforge");
+            pPlayer->SEND_GOSSIP_MENU(10194,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(9494.04, -6881.51, 7, 6, 0, "Quarelestra");
-            player->SEND_GOSSIP_MENU(10195,_Creature->GetGUID());
+            pPlayer->SEND_POI(9494.04, -6881.51, 7, 6, 0, "Quarelestra");
+            pPlayer->SEND_GOSSIP_MENU(10195,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Engineering
-            player->SEND_GOSSIP_MENU(10197,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(10197,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //First Aid
-            player->SEND_POI(9479.46, -6879.16, 7, 6, 0, "Kanaria");
-            player->SEND_GOSSIP_MENU(10198,_Creature->GetGUID());
+            pPlayer->SEND_POI(9479.46, -6879.16, 7, 6, 0, "Kanaria");
+            pPlayer->SEND_GOSSIP_MENU(10198,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Fishing
-            player->SEND_GOSSIP_MENU(10199,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(10199,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Herbalism
-            player->SEND_POI(8678.92, -6329.09, 7, 6, 0, "Botanist Tyniarrel");
-            player->SEND_GOSSIP_MENU(10200,_Creature->GetGUID());
+            pPlayer->SEND_POI(8678.92, -6329.09, 7, 6, 0, "Botanist Tyniarrel");
+            pPlayer->SEND_GOSSIP_MENU(10200,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Jewelcrafting
-            player->SEND_POI(9484.32, -6874.98, 7, 6, 0, "Aleinia");
-            player->SEND_GOSSIP_MENU(10203,_Creature->GetGUID());
+            pPlayer->SEND_POI(9484.32, -6874.98, 7, 6, 0, "Aleinia");
+            pPlayer->SEND_GOSSIP_MENU(10203,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Leatherworking
-            player->SEND_POI(9362.04, -7130.33, 7, 6, 0, "Sathein");
-            player->SEND_GOSSIP_MENU(10204,_Creature->GetGUID());
+            pPlayer->SEND_POI(9362.04, -7130.33, 7, 6, 0, "Sathein");
+            pPlayer->SEND_GOSSIP_MENU(10204,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Mining
-            player->SEND_GOSSIP_MENU(10205,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(10205,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Skinning
-            player->SEND_POI(9362.04, -7130.33, 7, 6, 0, "Mathreyn");
-            player->SEND_GOSSIP_MENU(10206,_Creature->GetGUID());
+            pPlayer->SEND_POI(9362.04, -7130.33, 7, 6, 0, "Mathreyn");
+            pPlayer->SEND_GOSSIP_MENU(10206,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Tailoring
-            player->SEND_POI(8680.36, -6327.51, 7, 6, 0, "Sempstress Ambershine");
-            player->SEND_GOSSIP_MENU(10207,_Creature->GetGUID());
+            pPlayer->SEND_POI(8680.36, -6327.51, 7, 6, 0, "Sempstress Ambershine");
+            pPlayer->SEND_GOSSIP_MENU(10207,_Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_eversong(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_eversong(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_eversong(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_eversong(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_eversong(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_eversong(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_eversong(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_eversong(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -1368,225 +1368,225 @@ CreatureAI* GetAI_guard_eversong(Creature *_Creature)
  * guard_exodar start
  *******************************************************/
 
-bool GossipHello_guard_exodar(Player *player, Creature *_Creature)
-{
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HIPPOGRYPH     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN            , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-    player->SEND_GOSSIP_MENU(9551, _Creature->GetGUID());
+bool GossipHello_guard_exodar(Player* pPlayer, Creature *_Creature)
+{
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HIPPOGRYPH     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN            , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+    pPlayer->SEND_GOSSIP_MENU(9551, _Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_exodar(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Auction house
-            player->SEND_POI(-4023.6, -11739.3, 7, 6, 0, "Exodar Auction House");
-            player->SEND_GOSSIP_MENU(9528, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4023.6, -11739.3, 7, 6, 0, "Exodar Auction House");
+            pPlayer->SEND_GOSSIP_MENU(9528, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Bank
-            player->SEND_POI(-3923.89, -11544.5, 7, 6, 0, "Exodar Bank");
-            player->SEND_GOSSIP_MENU(9529, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3923.89, -11544.5, 7, 6, 0, "Exodar Bank");
+            pPlayer->SEND_GOSSIP_MENU(9529, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Guild master
-            player->SEND_POI(-4092.57, -11626.5, 7, 6, 0, "Exodar Guild Master");
-            player->SEND_GOSSIP_MENU(9539, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4092.57, -11626.5, 7, 6, 0, "Exodar Guild Master");
+            pPlayer->SEND_GOSSIP_MENU(9539, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Hippogryph master
-            player->SEND_POI(-4060.46, -11787.1, 7, 6, 0, "Exodar Hippogryph Master");
-            player->SEND_GOSSIP_MENU(9530, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4060.46, -11787.1, 7, 6, 0, "Exodar Hippogryph Master");
+            pPlayer->SEND_GOSSIP_MENU(9530, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Inn
-            player->SEND_POI(-3741.87, -11695.1, 7, 6, 0, "Exodar Inn");
-            player->SEND_GOSSIP_MENU(9545, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3741.87, -11695.1, 7, 6, 0, "Exodar Inn");
+            pPlayer->SEND_GOSSIP_MENU(9545, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Mailbox
-            player->SEND_POI(-3972.5, -11696.0, 7, 6, 0, "Mailbox");
-            player->SEND_GOSSIP_MENU(10254, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3972.5, -11696.0, 7, 6, 0, "Mailbox");
+            pPlayer->SEND_GOSSIP_MENU(10254, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Stable master
-            player->SEND_POI(-3786.5, -11702.5, 7, 6, 0, "Stable Master Arthaid");
-            player->SEND_GOSSIP_MENU(9558, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3786.5, -11702.5, 7, 6, 0, "Stable Master Arthaid");
+            pPlayer->SEND_GOSSIP_MENU(9558, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Weapon trainer
-            player->SEND_POI(-4215.68, -11628.9, 7, 6, 0, "Weapon Master Handiir");
-            player->SEND_GOSSIP_MENU(9565, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4215.68, -11628.9, 7, 6, 0, "Weapon Master Handiir");
+            pPlayer->SEND_GOSSIP_MENU(9565, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Battlemaster
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY       , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN         , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARENA               , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_EYEOFTHESTORM       , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH         , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 5);
-            player->SEND_GOSSIP_MENU(9531, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY       , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN         , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARENA               , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_EYEOFTHESTORM       , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH         , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(9531, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->SEND_GOSSIP_MENU(9533, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(9533, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 13);
-            player->SEND_GOSSIP_MENU(9555, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 13);
+            pPlayer->SEND_GOSSIP_MENU(9555, _Creature->GetGUID());
             break;
     }
 }
 
-void SendBattleMasterMenu_guard_exodar(Player *player, Creature *_Creature, uint32 action)
+void SendBattleMasterMenu_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //AV
-            player->SEND_POI(-3978.1, -11357, 7, 6, 0, "Alterac Valley Battlemaster");
-            player->SEND_GOSSIP_MENU(9531, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3978.1, -11357, 7, 6, 0, "Alterac Valley Battlemaster");
+            pPlayer->SEND_GOSSIP_MENU(9531, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //AB
-            player->SEND_POI(-3998.9, -11345.2, 7, 6, 0, "Arathi Basin Battlemaster");
-            player->SEND_GOSSIP_MENU(9531,  _Creature->GetGUID());
+            pPlayer->SEND_POI(-3998.9, -11345.2, 7, 6, 0, "Arathi Basin Battlemaster");
+            pPlayer->SEND_GOSSIP_MENU(9531,  _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //A
-            player->SEND_POI(-3759.27, -11695.63, 7, 6, 0, "Miglik Blotstrom");
-            player->SEND_GOSSIP_MENU(10223, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3759.27, -11695.63, 7, 6, 0, "Miglik Blotstrom");
+            pPlayer->SEND_GOSSIP_MENU(10223, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //EOS
-            player->SEND_POI(-3978.1, -11357, 7, 6, 0, "Eye Of The Storm Battlemaster");
-            player->SEND_GOSSIP_MENU(9531, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3978.1, -11357, 7, 6, 0, "Eye Of The Storm Battlemaster");
+            pPlayer->SEND_GOSSIP_MENU(9531, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //WSG
-            player->SEND_POI(-3977.5, -11381.2, 7, 6, 0, "Warsong Gulch Battlemaster");
-            player->SEND_GOSSIP_MENU(9531, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3977.5, -11381.2, 7, 6, 0, "Warsong Gulch Battlemaster");
+            pPlayer->SEND_GOSSIP_MENU(9531, _Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_exodar(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Druid
-            player->SEND_POI(-4276.0, -11495, 7, 6, 0, "Exodar Druid Trainer");
-            player->SEND_GOSSIP_MENU(9534, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4276.0, -11495, 7, 6, 0, "Exodar Druid Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9534, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Hunter
-            player->SEND_POI(-4210.6, -11575.2, 7, 6, 0, "Exodar Hunter Trainer");
-            player->SEND_GOSSIP_MENU(9544, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4210.6, -11575.2, 7, 6, 0, "Exodar Hunter Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9544, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Mage
-            player->SEND_POI(-4057.32, -11556.5, 7, 6, 0, "Exodar Mage Trainer");
-            player->SEND_GOSSIP_MENU(9550, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4057.32, -11556.5, 7, 6, 0, "Exodar Mage Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9550, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Paladin
-            player->SEND_POI(-4191.2, -11470.4, 7, 6, 0, "Exodar Paladin Trainer");
-            player->SEND_GOSSIP_MENU(9553, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4191.2, -11470.4, 7, 6, 0, "Exodar Paladin Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9553, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Priest
-            player->SEND_POI(-3969.63, -11482.8, 7, 6, 0, "Exodar Priest Trainer");
-            player->SEND_GOSSIP_MENU(9554, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3969.63, -11482.8, 7, 6, 0, "Exodar Priest Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9554, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Shaman
-            player->SEND_POI(-3805.5, -11380.7, 7, 6, 0, "Exodar Shaman Trainer");
-            player->SEND_GOSSIP_MENU(9556, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3805.5, -11380.7, 7, 6, 0, "Exodar Shaman Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9556, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Warrior
-            player->SEND_POI(-4189.43, -11653.7, 7, 6, 0, "Exodar Warrior Trainer");
-            player->SEND_GOSSIP_MENU(9562, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4189.43, -11653.7, 7, 6, 0, "Exodar Warrior Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9562, _Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_exodar(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(-4040.6, -11364.5, 7, 6, 0, "Exodar Alchemy Trainer");
-            player->SEND_GOSSIP_MENU(9527, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4040.6, -11364.5, 7, 6, 0, "Exodar Alchemy Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9527, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(-4229.5, -11706, 7, 6, 0, "Exodar Blacksmithing Trainer");
-            player->SEND_GOSSIP_MENU(9532, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4229.5, -11706, 7, 6, 0, "Exodar Blacksmithing Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9532, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(-3798.3, -11651.7, 7, 6, 0, "Exodar Cooking Trainer");
-            player->SEND_GOSSIP_MENU(9551, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3798.3, -11651.7, 7, 6, 0, "Exodar Cooking Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9551, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_POI(-3889.3, -11495, 7, 6, 0, "Exodar Enchanting Trainer");
-            player->SEND_GOSSIP_MENU(9535, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3889.3, -11495, 7, 6, 0, "Exodar Enchanting Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9535, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Engineering
-            player->SEND_POI(-4257.68, -11640.3, 7, 6, 0, "Exodar Engineering Trainer");
-            player->SEND_GOSSIP_MENU(9536, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4257.68, -11640.3, 7, 6, 0, "Exodar Engineering Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9536, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //First Aid
-            player->SEND_POI(-3769.5, -11479.6, 7, 6, 0, "Exodar First Aid Trainer");
-            player->SEND_GOSSIP_MENU(9537, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3769.5, -11479.6, 7, 6, 0, "Exodar First Aid Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9537, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Fishing
-            player->SEND_POI(-3725.5, -11385.2, 7, 6, 0, "Exodar Fishing Trainer");
-            player->SEND_GOSSIP_MENU(9538, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3725.5, -11385.2, 7, 6, 0, "Exodar Fishing Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9538, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Jewelcrafting
-            player->SEND_POI(-3783, -11546, 7, 6, 0, "Exodar Jewelcrafting Trainer");
-            player->SEND_GOSSIP_MENU(9547, _Creature->GetGUID());
+            pPlayer->SEND_POI(-3783, -11546, 7, 6, 0, "Exodar Jewelcrafting Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9547, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Herbalism
-            player->SEND_POI(-4040.6, -11364.5, 7, 6, 0, "Exodar Herbalist Trainer");
-            player->SEND_GOSSIP_MENU(9543, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4040.6, -11364.5, 7, 6, 0, "Exodar Herbalist Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9543, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Leatherworking
-            player->SEND_POI(-4140.6, -11776.7, 7, 6, 0, "Exodar Leatherworking Trainer");
-            player->SEND_GOSSIP_MENU(9549, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4140.6, -11776.7, 7, 6, 0, "Exodar Leatherworking Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9549, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Mining
-            player->SEND_POI(-4228, -11697, 7, 6, 0, "Exodar Mining Trainer");
-            player->SEND_GOSSIP_MENU(9552, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4228, -11697, 7, 6, 0, "Exodar Mining Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9552, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Skinning
-            player->SEND_POI(-4134.97, -11760.5, 7, 6, 0, "Exodar Skinning Trainer");
-            player->SEND_GOSSIP_MENU(9557, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4134.97, -11760.5, 7, 6, 0, "Exodar Skinning Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9557, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 13:                   //Tailoring
-            player->SEND_POI(-4092.5, -11744.5, 7, 6, 0, "Exodar Tailor Trainer");
-            player->SEND_GOSSIP_MENU(9559, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4092.5, -11744.5, 7, 6, 0, "Exodar Tailor Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9559, _Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_exodar(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_exodar(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_exodar(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_exodar(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_exodar(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_exodar(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_exodar(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_exodar(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_exodar(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_exodar(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -1604,221 +1604,221 @@ CreatureAI* GetAI_guard_exodar(Creature *_Creature)
  * guard_ironforge start
  *******************************************************/
 
-bool GossipHello_guard_ironforge(Player *player, Creature *_Creature)
-{
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_IRONFORGE_BANK    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DEEPRUNTRAM       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GRYPHON           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN               , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
-    player->SEND_GOSSIP_MENU(2760, _Creature->GetGUID());
+bool GossipHello_guard_ironforge(Player* pPlayer, Creature *_Creature)
+{
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_IRONFORGE_BANK    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DEEPRUNTRAM       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GRYPHON           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN               , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
+    pPlayer->SEND_GOSSIP_MENU(2760, _Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_ironforge(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_ironforge(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Auction House
-            player->SEND_POI(-4957.39, -911.6, 7, 6, 0, "Ironforge Auction House");
-            player->SEND_GOSSIP_MENU(3014, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4957.39, -911.6, 7, 6, 0, "Ironforge Auction House");
+            pPlayer->SEND_GOSSIP_MENU(3014, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Bank
-            player->SEND_POI(-4891.91, -991.47, 7, 6, 0, "The Vault");
-            player->SEND_GOSSIP_MENU(2761, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4891.91, -991.47, 7, 6, 0, "The Vault");
+            pPlayer->SEND_GOSSIP_MENU(2761, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Tram
-            player->SEND_POI(-4835.27, -1294.69, 7, 6, 0, "Deeprun Tram");
-            player->SEND_GOSSIP_MENU(3814, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4835.27, -1294.69, 7, 6, 0, "Deeprun Tram");
+            pPlayer->SEND_GOSSIP_MENU(3814, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Gryphon Master
-            player->SEND_POI(-4821.52, -1152.3, 7, 6, 0, "Ironforge Gryphon Master");
-            player->SEND_GOSSIP_MENU(2762, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4821.52, -1152.3, 7, 6, 0, "Ironforge Gryphon Master");
+            pPlayer->SEND_GOSSIP_MENU(2762, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Guild Master
-            player->SEND_POI(-5021, -996.45, 7, 6, 0, "Ironforge Visitor's Center");
-            player->SEND_GOSSIP_MENU(2764, _Creature->GetGUID());
+            pPlayer->SEND_POI(-5021, -996.45, 7, 6, 0, "Ironforge Visitor's Center");
+            pPlayer->SEND_GOSSIP_MENU(2764, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Inn
-            player->SEND_POI(-4850.47, -872.57, 7, 6, 0, "Stonefire Tavern");
-            player->SEND_GOSSIP_MENU(2768, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4850.47, -872.57, 7, 6, 0, "Stonefire Tavern");
+            pPlayer->SEND_GOSSIP_MENU(2768, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Mailbox
-            player->SEND_POI(-4845.7, -880.55, 7, 6, 0, "Ironforge Mailbox");
-            player->SEND_GOSSIP_MENU(2769, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4845.7, -880.55, 7, 6, 0, "Ironforge Mailbox");
+            pPlayer->SEND_GOSSIP_MENU(2769, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Stable Master
-            player->SEND_POI(-5010.2, -1262, 7, 6, 0, "Ulbrek Firehand");
-            player->SEND_GOSSIP_MENU(5986, _Creature->GetGUID());
+            pPlayer->SEND_POI(-5010.2, -1262, 7, 6, 0, "Ulbrek Firehand");
+            pPlayer->SEND_GOSSIP_MENU(5986, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Weapons Trainer
-            player->SEND_POI(-5040, -1201.88, 7, 6, 0, "Bixi and Buliwyf");
-            player->SEND_GOSSIP_MENU(4518, _Creature->GetGUID());
+            pPlayer->SEND_POI(-5040, -1201.88, 7, 6, 0, "Bixi and Buliwyf");
+            pPlayer->SEND_GOSSIP_MENU(4518, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Battlemaster
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY   , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(7529, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY   , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(7529, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Class Trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE            , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE           , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->SEND_GOSSIP_MENU(2766, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE            , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE           , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->SEND_GOSSIP_MENU(2766, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Profession Trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING   , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING     , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING  , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->SEND_GOSSIP_MENU(2793, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING   , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING     , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING  , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->SEND_GOSSIP_MENU(2793, _Creature->GetGUID());
             break;
     }
 }
 
-void SendBattleMasterMenu_guard_ironforge(Player *player, Creature *_Creature, uint32 action)
+void SendBattleMasterMenu_guard_ironforge(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //AV
-            player->SEND_POI(-5047.87, -1263.77, 7, 6, 0, "Glordrum Steelbeard");
-            player->SEND_GOSSIP_MENU(7483, _Creature->GetGUID());
+            pPlayer->SEND_POI(-5047.87, -1263.77, 7, 6, 0, "Glordrum Steelbeard");
+            pPlayer->SEND_GOSSIP_MENU(7483, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //AB
-            player->SEND_POI(-5038.37, -1266.39, 7, 6, 0, "Donal Osgood");
-            player->SEND_GOSSIP_MENU(7649, _Creature->GetGUID());
+            pPlayer->SEND_POI(-5038.37, -1266.39, 7, 6, 0, "Donal Osgood");
+            pPlayer->SEND_GOSSIP_MENU(7649, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //WSG
-            player->SEND_POI(-5037.24, -1274.82, 7, 6, 0, "Lylandris");
-            player->SEND_GOSSIP_MENU(7528, _Creature->GetGUID());
+            pPlayer->SEND_POI(-5037.24, -1274.82, 7, 6, 0, "Lylandris");
+            pPlayer->SEND_GOSSIP_MENU(7528, _Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_ironforge(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_ironforge(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Hunter
-            player->SEND_POI(-5023, -1253.68, 7, 6, 0, "Hall of Arms");
-            player->SEND_GOSSIP_MENU(2770, _Creature->GetGUID());
+            pPlayer->SEND_POI(-5023, -1253.68, 7, 6, 0, "Hall of Arms");
+            pPlayer->SEND_GOSSIP_MENU(2770, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Mage
-            player->SEND_POI(-4627, -926.45, 7, 6, 0, "Hall of Mysteries");
-            player->SEND_GOSSIP_MENU(2771, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4627, -926.45, 7, 6, 0, "Hall of Mysteries");
+            pPlayer->SEND_GOSSIP_MENU(2771, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Paladin
-            player->SEND_POI(-4627.02, -926.45, 7, 6, 0, "Hall of Mysteries");
-            player->SEND_GOSSIP_MENU(2773, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4627.02, -926.45, 7, 6, 0, "Hall of Mysteries");
+            pPlayer->SEND_GOSSIP_MENU(2773, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Priest
-            player->SEND_POI(-4627, -926.45, 7, 6, 0, "Hall of Mysteries");
-            player->SEND_GOSSIP_MENU(2772, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4627, -926.45, 7, 6, 0, "Hall of Mysteries");
+            pPlayer->SEND_GOSSIP_MENU(2772, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Rogue
-            player->SEND_POI(-4647.83, -1124, 7, 6, 0, "Ironforge Rogue Trainer");
-            player->SEND_GOSSIP_MENU(2774, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4647.83, -1124, 7, 6, 0, "Ironforge Rogue Trainer");
+            pPlayer->SEND_GOSSIP_MENU(2774, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Warlock
-            player->SEND_POI(-4605, -1110.45, 7, 6, 0, "Ironforge Warlock Trainer");
-            player->SEND_GOSSIP_MENU(2775, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4605, -1110.45, 7, 6, 0, "Ironforge Warlock Trainer");
+            pPlayer->SEND_GOSSIP_MENU(2775, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Warrior
-            player->SEND_POI(-5023.08, -1253.68, 7, 6, 0, "Hall of Arms");
-            player->SEND_GOSSIP_MENU(2776, _Creature->GetGUID());
+            pPlayer->SEND_POI(-5023.08, -1253.68, 7, 6, 0, "Hall of Arms");
+            pPlayer->SEND_GOSSIP_MENU(2776, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Shaman
-            player->SEND_POI(-4732, -1147, 7, 6, 0, "Ironforge Shaman Trainer");
+            pPlayer->SEND_POI(-4732, -1147, 7, 6, 0, "Ironforge Shaman Trainer");
                                                             //incorrect id
-            player->SEND_GOSSIP_MENU(2766, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(2766, _Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_ironforge(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_ironforge(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(-4858.5, -1241.83, 7, 6, 0, "Berryfizz's Potions and Mixed Drinks");
-            player->SEND_GOSSIP_MENU(2794, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4858.5, -1241.83, 7, 6, 0, "Berryfizz's Potions and Mixed Drinks");
+            pPlayer->SEND_GOSSIP_MENU(2794, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(-4796.97, -1110.17, 7, 6, 0, "The Great Forge");
-            player->SEND_GOSSIP_MENU(2795, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4796.97, -1110.17, 7, 6, 0, "The Great Forge");
+            pPlayer->SEND_GOSSIP_MENU(2795, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(-4767.83, -1184.59, 7, 6, 0, "The Bronze Kettle");
-            player->SEND_GOSSIP_MENU(2796, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4767.83, -1184.59, 7, 6, 0, "The Bronze Kettle");
+            pPlayer->SEND_GOSSIP_MENU(2796, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_POI(-4803.72, -1196.53, 7, 6, 0, "Thistlefuzz Arcanery");
-            player->SEND_GOSSIP_MENU(2797, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4803.72, -1196.53, 7, 6, 0, "Thistlefuzz Arcanery");
+            pPlayer->SEND_GOSSIP_MENU(2797, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Engineering
-            player->SEND_POI(-4799.56, -1250.23, 7, 6, 0, "Springspindle's Gadgets");
-            player->SEND_GOSSIP_MENU(2798, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4799.56, -1250.23, 7, 6, 0, "Springspindle's Gadgets");
+            pPlayer->SEND_GOSSIP_MENU(2798, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //First Aid
-            player->SEND_POI(-4881.6, -1153.13, 7, 6, 0, "Ironforge Physician");
-            player->SEND_GOSSIP_MENU(2799, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4881.6, -1153.13, 7, 6, 0, "Ironforge Physician");
+            pPlayer->SEND_GOSSIP_MENU(2799, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Fishing
-            player->SEND_POI(-4597.91, -1091.93, 7, 6, 0, "Traveling Fisherman");
-            player->SEND_GOSSIP_MENU(2800, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4597.91, -1091.93, 7, 6, 0, "Traveling Fisherman");
+            pPlayer->SEND_GOSSIP_MENU(2800, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Herbalism
-            player->SEND_POI(-4876.9, -1151.92, 7, 6, 0, "Ironforge Physician");
-            player->SEND_GOSSIP_MENU(2801, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4876.9, -1151.92, 7, 6, 0, "Ironforge Physician");
+            pPlayer->SEND_GOSSIP_MENU(2801, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Leatherworking
-            player->SEND_POI(-4745, -1027.57, 7, 6, 0, "Finespindle's Leather Goods");
-            player->SEND_GOSSIP_MENU(2802, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4745, -1027.57, 7, 6, 0, "Finespindle's Leather Goods");
+            pPlayer->SEND_GOSSIP_MENU(2802, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Minning
-            player->SEND_POI(-4705.06, -1116.43, 7, 6, 0, "Deepmountain Mining Guild");
-            player->SEND_GOSSIP_MENU(2804, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4705.06, -1116.43, 7, 6, 0, "Deepmountain Mining Guild");
+            pPlayer->SEND_GOSSIP_MENU(2804, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Skinning
-            player->SEND_POI(-4745, -1027.57, 7, 6, 0, "Finespindle's Leather Goods");
-            player->SEND_GOSSIP_MENU(2805, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4745, -1027.57, 7, 6, 0, "Finespindle's Leather Goods");
+            pPlayer->SEND_GOSSIP_MENU(2805, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Tailoring
-            player->SEND_POI(-4719.60, -1056.96, 7, 6, 0, "Stonebrow's Clothier");
-            player->SEND_GOSSIP_MENU(2807, _Creature->GetGUID());
+            pPlayer->SEND_POI(-4719.60, -1056.96, 7, 6, 0, "Stonebrow's Clothier");
+            pPlayer->SEND_GOSSIP_MENU(2807, _Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_ironforge(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_ironforge(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_ironforge(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_ironforge(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_ironforge(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_ironforge(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_ironforge(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_ironforge(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_ironforge(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_ironforge(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -1836,135 +1836,135 @@ CreatureAI* GetAI_guard_ironforge(Creature *_Creature)
  * guard_mulgore start
  *******************************************************/
 
-bool GossipHello_guard_mulgore(Player *player, Creature *_Creature)
+bool GossipHello_guard_mulgore(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->SEND_GOSSIP_MENU(3543,_Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->SEND_GOSSIP_MENU(3543,_Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_mulgore(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_mulgore(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Bank
-            player->SEND_GOSSIP_MENU(4051,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4051,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Wind rider
-            player->SEND_GOSSIP_MENU(4052,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4052,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Inn
-            player->SEND_POI(-2361.38, -349.19, 7, 6, 0, "Bloodhoof Village Inn");
-            player->SEND_GOSSIP_MENU(4053,_Creature->GetGUID());
+            pPlayer->SEND_POI(-2361.38, -349.19, 7, 6, 0, "Bloodhoof Village Inn");
+            pPlayer->SEND_GOSSIP_MENU(4053,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Stable master
-            player->SEND_POI(-2338.86, -357.56, 7, 6, 0, "Seikwa");
-            player->SEND_GOSSIP_MENU(5976,_Creature->GetGUID());
+            pPlayer->SEND_POI(-2338.86, -357.56, 7, 6, 0, "Seikwa");
+            pPlayer->SEND_GOSSIP_MENU(5976,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID           , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->SEND_GOSSIP_MENU(4069,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID           , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(4069,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING   , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING  , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->SEND_GOSSIP_MENU(4070,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING   , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING  , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->SEND_GOSSIP_MENU(4070,_Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_mulgore(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_mulgore(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Druid
-            player->SEND_POI(-2312.15, -443.69, 7, 6, 0, "Gennia Runetotem");
-            player->SEND_GOSSIP_MENU(4054,_Creature->GetGUID());
+            pPlayer->SEND_POI(-2312.15, -443.69, 7, 6, 0, "Gennia Runetotem");
+            pPlayer->SEND_GOSSIP_MENU(4054,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Hunter
-            player->SEND_POI(-2178.14, -406.14, 7, 6, 0, "Yaw Sharpmane");
-            player->SEND_GOSSIP_MENU(4055,_Creature->GetGUID());
+            pPlayer->SEND_POI(-2178.14, -406.14, 7, 6, 0, "Yaw Sharpmane");
+            pPlayer->SEND_GOSSIP_MENU(4055,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Shaman
-            player->SEND_POI(-2301.5, -439.87, 7, 6, 0, "Narm Skychaser");
-            player->SEND_GOSSIP_MENU(4056,_Creature->GetGUID());
+            pPlayer->SEND_POI(-2301.5, -439.87, 7, 6, 0, "Narm Skychaser");
+            pPlayer->SEND_GOSSIP_MENU(4056,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Warrior
-            player->SEND_POI(-2345.43, -494.11, 7, 6, 0, "Krang Stonehoof");
-            player->SEND_GOSSIP_MENU(4057,_Creature->GetGUID());
+            pPlayer->SEND_POI(-2345.43, -494.11, 7, 6, 0, "Krang Stonehoof");
+            pPlayer->SEND_GOSSIP_MENU(4057,_Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_mulgore(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_mulgore(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_GOSSIP_MENU(4058,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4058,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_GOSSIP_MENU(4059,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4059,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(-2263.34, -287.91, 7, 6, 0, "Pyall Silentstride");
-            player->SEND_GOSSIP_MENU(4060,_Creature->GetGUID());
+            pPlayer->SEND_POI(-2263.34, -287.91, 7, 6, 0, "Pyall Silentstride");
+            pPlayer->SEND_GOSSIP_MENU(4060,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_GOSSIP_MENU(4061,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4061,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //First Aid
-            player->SEND_POI(-2353.52, -355.82, 7, 6, 0, "Vira Younghoof");
-            player->SEND_GOSSIP_MENU(4062,_Creature->GetGUID());
+            pPlayer->SEND_POI(-2353.52, -355.82, 7, 6, 0, "Vira Younghoof");
+            pPlayer->SEND_GOSSIP_MENU(4062,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Fishing
-            player->SEND_POI(-2349.21, -241.37, 7, 6, 0, "Uthan Stillwater");
-            player->SEND_GOSSIP_MENU(4063,_Creature->GetGUID());
+            pPlayer->SEND_POI(-2349.21, -241.37, 7, 6, 0, "Uthan Stillwater");
+            pPlayer->SEND_GOSSIP_MENU(4063,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Herbalism
-            player->SEND_GOSSIP_MENU(4064,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4064,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Leatherworking
-            player->SEND_POI(-2257.12, -288.63, 7, 6, 0, "Chaw Stronghide");
-            player->SEND_GOSSIP_MENU(4065,_Creature->GetGUID());
+            pPlayer->SEND_POI(-2257.12, -288.63, 7, 6, 0, "Chaw Stronghide");
+            pPlayer->SEND_GOSSIP_MENU(4065,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Mining
-            player->SEND_GOSSIP_MENU(4066,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4066,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Skinning
-            player->SEND_POI(-2252.94, -291.32, 7, 6, 0, "Yonn Deepcut");
-            player->SEND_GOSSIP_MENU(4067,_Creature->GetGUID());
+            pPlayer->SEND_POI(-2252.94, -291.32, 7, 6, 0, "Yonn Deepcut");
+            pPlayer->SEND_GOSSIP_MENU(4067,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Tailoring
-            player->SEND_GOSSIP_MENU(4068,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4068,_Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_mulgore(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_mulgore(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_mulgore(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_mulgore(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_mulgore(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_mulgore(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_mulgore(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_mulgore(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -1982,226 +1982,226 @@ CreatureAI* GetAI_guard_mulgore(Creature *_Creature)
  * guard_orgrimmar start
  *******************************************************/
 
-bool GossipHello_guard_orgrimmar(Player *player, Creature *_Creature)
-{
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ZEPPLINMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_OFFICERS      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
-    player->SEND_GOSSIP_MENU(2593,_Creature->GetGUID());
+bool GossipHello_guard_orgrimmar(Player* pPlayer, Creature *_Creature)
+{
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ZEPPLINMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_OFFICERS      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
+    pPlayer->SEND_GOSSIP_MENU(2593,_Creature->GetGUID());
 
     return true;
 }
 
-void SendDefaultMenu_guard_orgrimmar(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_orgrimmar(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Bank
-            player->SEND_POI(1631.51, -4375.33, 7, 6, 0, "Bank of Orgrimmar");
-            player->SEND_GOSSIP_MENU(2554,_Creature->GetGUID());
+            pPlayer->SEND_POI(1631.51, -4375.33, 7, 6, 0, "Bank of Orgrimmar");
+            pPlayer->SEND_GOSSIP_MENU(2554,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //wind rider
-            player->SEND_POI(1676.6, -4332.72, 7, 6, 0, "The Sky Tower");
-            player->SEND_GOSSIP_MENU(2555,_Creature->GetGUID());
+            pPlayer->SEND_POI(1676.6, -4332.72, 7, 6, 0, "The Sky Tower");
+            pPlayer->SEND_GOSSIP_MENU(2555,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //guild master
-            player->SEND_POI(1576.93, -4294.75, 7, 6, 0, "Horde Embassy");
-            player->SEND_GOSSIP_MENU(2556,_Creature->GetGUID());
+            pPlayer->SEND_POI(1576.93, -4294.75, 7, 6, 0, "Horde Embassy");
+            pPlayer->SEND_GOSSIP_MENU(2556,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Inn
-            player->SEND_POI(1644.51, -4447.27, 7, 6, 0, "Orgrimmar Inn");
-            player->SEND_GOSSIP_MENU(2557,_Creature->GetGUID());
+            pPlayer->SEND_POI(1644.51, -4447.27, 7, 6, 0, "Orgrimmar Inn");
+            pPlayer->SEND_GOSSIP_MENU(2557,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //mailbox
-            player->SEND_POI(1622.53, -4388.79, 7, 6, 0, "Orgrimmar Mailbox");
-            player->SEND_GOSSIP_MENU(2558,_Creature->GetGUID());
+            pPlayer->SEND_POI(1622.53, -4388.79, 7, 6, 0, "Orgrimmar Mailbox");
+            pPlayer->SEND_GOSSIP_MENU(2558,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //auction house
-            player->SEND_POI(1679.21, -4450.1, 7, 6, 0, "Orgrimmar Auction House");
-            player->SEND_GOSSIP_MENU(3075,_Creature->GetGUID());
+            pPlayer->SEND_POI(1679.21, -4450.1, 7, 6, 0, "Orgrimmar Auction House");
+            pPlayer->SEND_GOSSIP_MENU(3075,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //zeppelin
-            player->SEND_POI(1337.36, -4632.7, 7, 6, 0, "Orgrimmar Zeppelin Tower");
-            player->SEND_GOSSIP_MENU(3173,_Creature->GetGUID());
+            pPlayer->SEND_POI(1337.36, -4632.7, 7, 6, 0, "Orgrimmar Zeppelin Tower");
+            pPlayer->SEND_GOSSIP_MENU(3173,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //weapon master
-            player->SEND_POI(2092.56, -4823.95, 7, 6, 0, "Sayoc & Hanashi");
-            player->SEND_GOSSIP_MENU(4519,_Creature->GetGUID());
+            pPlayer->SEND_POI(2092.56, -4823.95, 7, 6, 0, "Sayoc & Hanashi");
+            pPlayer->SEND_GOSSIP_MENU(4519,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //stable master
-            player->SEND_POI(2133.12, -4663.93, 7, 6, 0, "Xon'cha");
-            player->SEND_GOSSIP_MENU(5974,_Creature->GetGUID());
+            pPlayer->SEND_POI(2133.12, -4663.93, 7, 6, 0, "Xon'cha");
+            pPlayer->SEND_GOSSIP_MENU(5974,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //officers lounge
-            player->SEND_POI(1633.56, -4249.37, 7, 6, 0, "Hall of Legends");
-            player->SEND_GOSSIP_MENU(7046,_Creature->GetGUID());
+            pPlayer->SEND_POI(1633.56, -4249.37, 7, 6, 0, "Hall of Legends");
+            pPlayer->SEND_GOSSIP_MENU(7046,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //battlemaster
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY       , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN         , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH         , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(7521,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY       , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN         , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH         , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(7521,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->SEND_GOSSIP_MENU(2599,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN             , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->SEND_GOSSIP_MENU(2599,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 13:                   //profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->SEND_GOSSIP_MENU(2594,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->SEND_GOSSIP_MENU(2594,_Creature->GetGUID());
             break;
     }
 }
 
-void SendBattleMasterMenu_guard_orgrimmar(Player *player, Creature *_Creature, uint32 action)
+void SendBattleMasterMenu_guard_orgrimmar(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //AV
-            player->SEND_POI(1983.92, -4794.2, 7, 6, 0, "Hall of the Brave");
-            player->SEND_GOSSIP_MENU(7484,_Creature->GetGUID());
+            pPlayer->SEND_POI(1983.92, -4794.2, 7, 6, 0, "Hall of the Brave");
+            pPlayer->SEND_GOSSIP_MENU(7484,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //AB
-            player->SEND_POI(1983.92, -4794.2, 7, 6, 0, "Hall of the Brave");
-            player->SEND_GOSSIP_MENU(7644,_Creature->GetGUID());
+            pPlayer->SEND_POI(1983.92, -4794.2, 7, 6, 0, "Hall of the Brave");
+            pPlayer->SEND_GOSSIP_MENU(7644,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //WSG
-            player->SEND_POI(1983.92, -4794.2, 7, 6, 0, "Hall of the Brave");
-            player->SEND_GOSSIP_MENU(7520,_Creature->GetGUID());
+            pPlayer->SEND_POI(1983.92, -4794.2, 7, 6, 0, "Hall of the Brave");
+            pPlayer->SEND_GOSSIP_MENU(7520,_Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_orgrimmar(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_orgrimmar(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Hunter
-            player->SEND_POI(2114.84, -4625.31, 7, 6, 0, "Orgrimmar Hunter's Hall");
-            player->SEND_GOSSIP_MENU(2559,_Creature->GetGUID());
+            pPlayer->SEND_POI(2114.84, -4625.31, 7, 6, 0, "Orgrimmar Hunter's Hall");
+            pPlayer->SEND_GOSSIP_MENU(2559,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Mage
-            player->SEND_POI(1451.26, -4223.33, 7, 6, 0, "Darkbriar Lodge");
-            player->SEND_GOSSIP_MENU(2560,_Creature->GetGUID());
+            pPlayer->SEND_POI(1451.26, -4223.33, 7, 6, 0, "Darkbriar Lodge");
+            pPlayer->SEND_GOSSIP_MENU(2560,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Priest
-            player->SEND_POI(1442.21, -4183.24, 7, 6, 0, "Spirit Lodge");
-            player->SEND_GOSSIP_MENU(2561,_Creature->GetGUID());
+            pPlayer->SEND_POI(1442.21, -4183.24, 7, 6, 0, "Spirit Lodge");
+            pPlayer->SEND_GOSSIP_MENU(2561,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Shaman
-            player->SEND_POI(1925.34, -4181.89, 7, 6, 0, "Thrall's Fortress");
-            player->SEND_GOSSIP_MENU(2562,_Creature->GetGUID());
+            pPlayer->SEND_POI(1925.34, -4181.89, 7, 6, 0, "Thrall's Fortress");
+            pPlayer->SEND_GOSSIP_MENU(2562,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Rogue
-            player->SEND_POI(1773.39, -4278.97, 7, 6, 0, "Shadowswift Brotherhood");
-            player->SEND_GOSSIP_MENU(2563,_Creature->GetGUID());
+            pPlayer->SEND_POI(1773.39, -4278.97, 7, 6, 0, "Shadowswift Brotherhood");
+            pPlayer->SEND_GOSSIP_MENU(2563,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Warlock
-            player->SEND_POI(1849.57, -4359.68, 7, 6, 0, "Darkfire Enclave");
-            player->SEND_GOSSIP_MENU(2564,_Creature->GetGUID());
+            pPlayer->SEND_POI(1849.57, -4359.68, 7, 6, 0, "Darkfire Enclave");
+            pPlayer->SEND_GOSSIP_MENU(2564,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Warrior
-            player->SEND_POI(1983.92, -4794.2, 7, 6, 0, "Hall of the Brave");
-            player->SEND_GOSSIP_MENU(2565,_Creature->GetGUID());
+            pPlayer->SEND_POI(1983.92, -4794.2, 7, 6, 0, "Hall of the Brave");
+            pPlayer->SEND_GOSSIP_MENU(2565,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Paladin
-            player->SEND_POI(1906.65, -4134.26, 7, 6, 0, "Valley of Wisdom");
-            player->SEND_GOSSIP_MENU(10843,_Creature->GetGUID());
+            pPlayer->SEND_POI(1906.65, -4134.26, 7, 6, 0, "Valley of Wisdom");
+            pPlayer->SEND_GOSSIP_MENU(10843,_Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_orgrimmar(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_orgrimmar(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(1955.17, -4475.79, 7, 6, 0, "Yelmak's Alchemy and Potions");
-            player->SEND_GOSSIP_MENU(2497,_Creature->GetGUID());
+            pPlayer->SEND_POI(1955.17, -4475.79, 7, 6, 0, "Yelmak's Alchemy and Potions");
+            pPlayer->SEND_GOSSIP_MENU(2497,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(2054.34, -4831.85, 7, 6, 0, "The Burning Anvil");
-            player->SEND_GOSSIP_MENU(2499,_Creature->GetGUID());
+            pPlayer->SEND_POI(2054.34, -4831.85, 7, 6, 0, "The Burning Anvil");
+            pPlayer->SEND_GOSSIP_MENU(2499,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(1780.96, -4481.31, 7, 6, 0, "Borstan's Firepit");
-            player->SEND_GOSSIP_MENU(2500,_Creature->GetGUID());
+            pPlayer->SEND_POI(1780.96, -4481.31, 7, 6, 0, "Borstan's Firepit");
+            pPlayer->SEND_GOSSIP_MENU(2500,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_POI(1917.5, -4434.95, 7, 6, 0, "Godan's Runeworks");
-            player->SEND_GOSSIP_MENU(2501,_Creature->GetGUID());
+            pPlayer->SEND_POI(1917.5, -4434.95, 7, 6, 0, "Godan's Runeworks");
+            pPlayer->SEND_GOSSIP_MENU(2501,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Engineering
-            player->SEND_POI(2038.45, -4744.75, 7, 6, 0, "Nogg's Machine Shop");
-            player->SEND_GOSSIP_MENU(2653,_Creature->GetGUID());
+            pPlayer->SEND_POI(2038.45, -4744.75, 7, 6, 0, "Nogg's Machine Shop");
+            pPlayer->SEND_GOSSIP_MENU(2653,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //First Aid
-            player->SEND_POI(1485.21, -4160.91, 7, 6, 0, "Survival of the Fittest");
-            player->SEND_GOSSIP_MENU(2502,_Creature->GetGUID());
+            pPlayer->SEND_POI(1485.21, -4160.91, 7, 6, 0, "Survival of the Fittest");
+            pPlayer->SEND_GOSSIP_MENU(2502,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Fishing
-            player->SEND_POI(1994.15, -4655.7, 7, 6, 0, "Lumak's Fishing");
-            player->SEND_GOSSIP_MENU(2503,_Creature->GetGUID());
+            pPlayer->SEND_POI(1994.15, -4655.7, 7, 6, 0, "Lumak's Fishing");
+            pPlayer->SEND_GOSSIP_MENU(2503,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Herbalism
-            player->SEND_POI(1898.61, -4454.93, 7, 6, 0, "Jandi's Arboretum");
-            player->SEND_GOSSIP_MENU(2504,_Creature->GetGUID());
+            pPlayer->SEND_POI(1898.61, -4454.93, 7, 6, 0, "Jandi's Arboretum");
+            pPlayer->SEND_GOSSIP_MENU(2504,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Leatherworking
-            player->SEND_POI(1852.82, -4562.31, 7, 6, 0, "Kodohide Leatherworkers");
-            player->SEND_GOSSIP_MENU(2513,_Creature->GetGUID());
+            pPlayer->SEND_POI(1852.82, -4562.31, 7, 6, 0, "Kodohide Leatherworkers");
+            pPlayer->SEND_GOSSIP_MENU(2513,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Mining
-            player->SEND_POI(2029.79, -4704, 7, 6, 0, "Red Canyon Mining");
-            player->SEND_GOSSIP_MENU(2515,_Creature->GetGUID());
+            pPlayer->SEND_POI(2029.79, -4704, 7, 6, 0, "Red Canyon Mining");
+            pPlayer->SEND_GOSSIP_MENU(2515,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Skinning
-            player->SEND_POI(1852.82, -4562.31, 7, 6, 0, "Kodohide Leatherworkers");
-            player->SEND_GOSSIP_MENU(2516,_Creature->GetGUID());
+            pPlayer->SEND_POI(1852.82, -4562.31, 7, 6, 0, "Kodohide Leatherworkers");
+            pPlayer->SEND_GOSSIP_MENU(2516,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Tailoring
-            player->SEND_POI(1802.66, -4560.66, 7, 6, 0, "Magar's Cloth Goods");
-            player->SEND_GOSSIP_MENU(2518,_Creature->GetGUID());
+            pPlayer->SEND_POI(1802.66, -4560.66, 7, 6, 0, "Magar's Cloth Goods");
+            pPlayer->SEND_GOSSIP_MENU(2518,_Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_orgrimmar(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_orgrimmar(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_orgrimmar(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_orgrimmar(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_orgrimmar(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_orgrimmar(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_orgrimmar(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_orgrimmar(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_orgrimmar(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_orgrimmar(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -2219,240 +2219,240 @@ CreatureAI* GetAI_guard_orgrimmar(Creature *_Creature)
  * guard_shattrath start
  *******************************************************/
 
-bool GossipHello_guard_shattrath(Player *player, Creature *_Creature)
-{
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAVERN                       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK                         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN                          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FLIGHTMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX                      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER                  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MANALOOM                     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMYLAB                   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMMERCHANT                  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-    player->SEND_GOSSIP_MENU(10321, _Creature->GetGUID());
+bool GossipHello_guard_shattrath(Player* pPlayer, Creature *_Creature)
+{
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAVERN                       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK                         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN                          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FLIGHTMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX                      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER                  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MANALOOM                     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMYLAB                   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMMERCHANT                  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+    pPlayer->SEND_GOSSIP_MENU(10321, _Creature->GetGUID());
 
     return true;
 }
 
-void SendDefaultMenu_guard_shattrath(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Tavern
-            player->SEND_POI(-1759.5, 5165, 7, 6, 0, "Worlds End Tavern");
-            player->SEND_GOSSIP_MENU(10394, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1759.5, 5165, 7, 6, 0, "Worlds End Tavern");
+            pPlayer->SEND_GOSSIP_MENU(10394, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Bank
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANKALDOR            , GOSSIP_SENDER_SEC_BANK, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANKSCYERS           , GOSSIP_SENDER_SEC_BANK, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(10379, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANKALDOR            , GOSSIP_SENDER_SEC_BANK, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANKSCYERS           , GOSSIP_SENDER_SEC_BANK, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(10379, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Inn
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INNALDOR             , GOSSIP_SENDER_SEC_INN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INNSCYERS            , GOSSIP_SENDER_SEC_INN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(10382, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INNALDOR             , GOSSIP_SENDER_SEC_INN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INNSCYERS            , GOSSIP_SENDER_SEC_INN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(10382, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Flight master
-            player->SEND_POI(-1832, 5299, 7, 6, 0, "Flight Master");
-            player->SEND_GOSSIP_MENU(10385, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1832, 5299, 7, 6, 0, "Flight Master");
+            pPlayer->SEND_GOSSIP_MENU(10385, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Mailbox
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANKALDOR           , GOSSIP_SENDER_SEC_MAILBOX, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INNALDOR            , GOSSIP_SENDER_SEC_MAILBOX, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANKSCYERS          , GOSSIP_SENDER_SEC_MAILBOX, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INNSCYERS           , GOSSIP_SENDER_SEC_MAILBOX, GOSSIP_ACTION_INFO_DEF + 4);
-            player->SEND_GOSSIP_MENU(10386, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANKALDOR           , GOSSIP_SENDER_SEC_MAILBOX, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INNALDOR            , GOSSIP_SENDER_SEC_MAILBOX, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANKSCYERS          , GOSSIP_SENDER_SEC_MAILBOX, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INNSCYERS           , GOSSIP_SENDER_SEC_MAILBOX, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(10386, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Stable master
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEALDOR          , GOSSIP_SENDER_SEC_STABLEMASTER, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLESCYERS         , GOSSIP_SENDER_SEC_STABLEMASTER, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(10387, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEALDOR          , GOSSIP_SENDER_SEC_STABLEMASTER, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLESCYERS         , GOSSIP_SENDER_SEC_STABLEMASTER, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(10387, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Battlemaster
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERALLIANCE , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERHORDE    , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERARENA    , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(10388, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERALLIANCE , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERHORDE    , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERARENA    , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(10388, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Profession master
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->SEND_GOSSIP_MENU(10391, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->SEND_GOSSIP_MENU(10391, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Mana Loom
-            player->SEND_POI(-2070, 5265.5, 7, 6, 0, "Mana Loom");
-            player->SEND_GOSSIP_MENU(10503, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2070, 5265.5, 7, 6, 0, "Mana Loom");
+            pPlayer->SEND_GOSSIP_MENU(10503, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Alchemy Lab
-            player->SEND_POI(-1648.5, 5540, 7, 6, 0, "Alchemy Lab");
-            player->SEND_GOSSIP_MENU(10321, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1648.5, 5540, 7, 6, 0, "Alchemy Lab");
+            pPlayer->SEND_GOSSIP_MENU(10321, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Gem Merchant
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMALDOR             , GOSSIP_SENDER_SEC_GEMMERCHANT, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMSCYERS            , GOSSIP_SENDER_SEC_GEMMERCHANT, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(10697, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMALDOR             , GOSSIP_SENDER_SEC_GEMMERCHANT, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMSCYERS            , GOSSIP_SENDER_SEC_GEMMERCHANT, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(10697, _Creature->GetGUID());
             break;
     }
 }
 
-void SendBankMenu_guard_shattrath(Player *player, Creature *_Creature, uint32 action)
+void SendBankMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)
     {
-        player->SEND_POI(-1730.5, 5496, 7, 6, 0, "Aldor Bank");
-        player->SEND_GOSSIP_MENU(10380,  _Creature->GetGUID());
+        pPlayer->SEND_POI(-1730.5, 5496, 7, 6, 0, "Aldor Bank");
+        pPlayer->SEND_GOSSIP_MENU(10380,  _Creature->GetGUID());
     }
     if (action == GOSSIP_ACTION_INFO_DEF + 2)
     {
-        player->SEND_POI(-1997.7, 5363, 7, 6, 0, "Scyers Bank");
-        player->SEND_GOSSIP_MENU(10381, _Creature->GetGUID());
+        pPlayer->SEND_POI(-1997.7, 5363, 7, 6, 0, "Scyers Bank");
+        pPlayer->SEND_GOSSIP_MENU(10381, _Creature->GetGUID());
     }
 }
 
-void SendInnMenu_guard_shattrath(Player *player, Creature *_Creature, uint32 action)
+void SendInnMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)
     {
-        player->SEND_POI(-1895, 5767, 7, 6, 0, "Aldor Inn");
-        player->SEND_GOSSIP_MENU(10383,  _Creature->GetGUID());
+        pPlayer->SEND_POI(-1895, 5767, 7, 6, 0, "Aldor Inn");
+        pPlayer->SEND_GOSSIP_MENU(10383,  _Creature->GetGUID());
     }
     if (action == GOSSIP_ACTION_INFO_DEF + 2)
     {
-        player->SEND_POI(-2178, 5405, 7, 6, 0, "Scyers Inn");
-        player->SEND_GOSSIP_MENU(10384, _Creature->GetGUID());
+        pPlayer->SEND_POI(-2178, 5405, 7, 6, 0, "Scyers Inn");
+        pPlayer->SEND_GOSSIP_MENU(10384, _Creature->GetGUID());
     }
 }
 
-void SendMailboxMenu_guard_shattrath(Player *player, Creature *_Creature, uint32 action)
+void SendMailboxMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:
-            player->SEND_POI(-1730.5, 5496, 7, 6, 0, "Aldor Bank");
-            player->SEND_GOSSIP_MENU(10380,  _Creature->GetGUID());
+            pPlayer->SEND_POI(-1730.5, 5496, 7, 6, 0, "Aldor Bank");
+            pPlayer->SEND_GOSSIP_MENU(10380,  _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            player->SEND_POI(-1895, 5767, 7, 6, 0, "Aldor Inn");
-            player->SEND_GOSSIP_MENU(10383,  _Creature->GetGUID());
+            pPlayer->SEND_POI(-1895, 5767, 7, 6, 0, "Aldor Inn");
+            pPlayer->SEND_GOSSIP_MENU(10383,  _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
-            player->SEND_POI(-1997.7, 5363, 7, 6, 0, "Scyers Bank");
-            player->SEND_GOSSIP_MENU(10381, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1997.7, 5363, 7, 6, 0, "Scyers Bank");
+            pPlayer->SEND_GOSSIP_MENU(10381, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:
-            player->SEND_POI(-2178, 5405, 7, 6, 0, "Scyers Inn");
-            player->SEND_GOSSIP_MENU(10384, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2178, 5405, 7, 6, 0, "Scyers Inn");
+            pPlayer->SEND_GOSSIP_MENU(10384, _Creature->GetGUID());
             break;
     }
 }
 
-void SendStableMasterMenu_guard_shattrath(Player *player, Creature *_Creature, uint32 action)
+void SendStableMasterMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)
     {
-        player->SEND_POI(-1888.5, 5761, 7, 6, 0, "Aldor Stable");
-        player->SEND_GOSSIP_MENU(10321,  _Creature->GetGUID());
+        pPlayer->SEND_POI(-1888.5, 5761, 7, 6, 0, "Aldor Stable");
+        pPlayer->SEND_GOSSIP_MENU(10321,  _Creature->GetGUID());
     }
     if (action == GOSSIP_ACTION_INFO_DEF + 2)
     {
-        player->SEND_POI(-2170, 5404, 7, 6, 0, "Scyers Stable");
-        player->SEND_GOSSIP_MENU(10321, _Creature->GetGUID());
+        pPlayer->SEND_POI(-2170, 5404, 7, 6, 0, "Scyers Stable");
+        pPlayer->SEND_GOSSIP_MENU(10321, _Creature->GetGUID());
     }
 }
 
-void SendBattleMasterMenu_guard_shattrath(Player *player, Creature *_Creature, uint32 action)
+void SendBattleMasterMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:
-            player->SEND_POI(-1774, 5251, 7, 6, 0, "Alliance Battlemasters");
-            player->SEND_GOSSIP_MENU(10389, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1774, 5251, 7, 6, 0, "Alliance Battlemasters");
+            pPlayer->SEND_GOSSIP_MENU(10389, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            player->SEND_POI(-1963, 5263, 7, 6, 0, "Horde Battlemasters");
-            player->SEND_GOSSIP_MENU(10390,  _Creature->GetGUID());
+            pPlayer->SEND_POI(-1963, 5263, 7, 6, 0, "Horde Battlemasters");
+            pPlayer->SEND_GOSSIP_MENU(10390,  _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
-            player->SEND_POI(-1960, 5175, 7, 6, 0, "Arena Battlemasters");
-            player->SEND_GOSSIP_MENU(12510,  _Creature->GetGUID());
+            pPlayer->SEND_POI(-1960, 5175, 7, 6, 0, "Arena Battlemasters");
+            pPlayer->SEND_GOSSIP_MENU(12510,  _Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_shattrath(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(-1648.5, 5534, 7, 6, 0, "Lorokeem");
-            player->SEND_GOSSIP_MENU(10392, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1648.5, 5534, 7, 6, 0, "Lorokeem");
+            pPlayer->SEND_GOSSIP_MENU(10392, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(-1847, 5222, 7, 6, 0, "Kradu Grimblade and Zula Slagfury");
-            player->SEND_GOSSIP_MENU(10400, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1847, 5222, 7, 6, 0, "Kradu Grimblade and Zula Slagfury");
+            pPlayer->SEND_GOSSIP_MENU(10400, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(-2067.4, 5316.5, 7, 6, 0, "Jack Trapper");
-            player->SEND_GOSSIP_MENU(10393, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2067.4, 5316.5, 7, 6, 0, "Jack Trapper");
+            pPlayer->SEND_GOSSIP_MENU(10393, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_POI(-2263.5, 5563.5, 7, 6, 0, "High Enchanter Bardolan");
-            player->SEND_GOSSIP_MENU(10395, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2263.5, 5563.5, 7, 6, 0, "High Enchanter Bardolan");
+            pPlayer->SEND_GOSSIP_MENU(10395, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //First Aid
-            player->SEND_POI(-1591, 5265.5, 7, 6, 0, "Mildred Fletcher");
-            player->SEND_GOSSIP_MENU(10396, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1591, 5265.5, 7, 6, 0, "Mildred Fletcher");
+            pPlayer->SEND_GOSSIP_MENU(10396, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Jewelcrafting
-            player->SEND_POI(-1654, 5667.5, 7, 6, 0, "Hamanar");
-            player->SEND_GOSSIP_MENU(10397, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1654, 5667.5, 7, 6, 0, "Hamanar");
+            pPlayer->SEND_GOSSIP_MENU(10397, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Leatherworking
-            player->SEND_POI(-2060.5, 5256.5, 7, 6, 0, "Darmari");
-            player->SEND_GOSSIP_MENU(10399, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2060.5, 5256.5, 7, 6, 0, "Darmari");
+            pPlayer->SEND_GOSSIP_MENU(10399, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Skinning
-            player->SEND_POI(-2048, 5300, 7, 6, 0, "Seymour");
-            player->SEND_GOSSIP_MENU(10398, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2048, 5300, 7, 6, 0, "Seymour");
+            pPlayer->SEND_GOSSIP_MENU(10398, _Creature->GetGUID());
             break;
     }
 }
 
-void SendGemMerchantMenu_guard_shattrath(Player *player, Creature *_Creature, uint32 action)
+void SendGemMerchantMenu_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)
     {
-        player->SEND_POI(-1645, 5669.5, 7, 6, 0, "Aldor Gem Merchant");
-        player->SEND_GOSSIP_MENU(10698,  _Creature->GetGUID());
+        pPlayer->SEND_POI(-1645, 5669.5, 7, 6, 0, "Aldor Gem Merchant");
+        pPlayer->SEND_GOSSIP_MENU(10698,  _Creature->GetGUID());
     }
     if (action == GOSSIP_ACTION_INFO_DEF + 2)
     {
-        player->SEND_POI(-2193, 5424.5, 7, 6, 0, "Scyers Gem Merchant");
-        player->SEND_GOSSIP_MENU(10699, _Creature->GetGUID());
+        pPlayer->SEND_POI(-2193, 5424.5, 7, 6, 0, "Scyers Gem Merchant");
+        pPlayer->SEND_GOSSIP_MENU(10699, _Creature->GetGUID());
     }
 }
 
-bool GossipSelect_guard_shattrath(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_shattrath(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:              SendDefaultMenu_guard_shattrath(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_BANK:          SendBankMenu_guard_shattrath(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_INN:           SendInnMenu_guard_shattrath(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_STABLEMASTER:  SendStableMasterMenu_guard_shattrath(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_GEMMERCHANT:   SendGemMerchantMenu_guard_shattrath(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_MAILBOX:       SendMailboxMenu_guard_shattrath(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:     SendProfTrainerMenu_guard_shattrath(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_BATTLEINFO:    SendBattleMasterMenu_guard_shattrath(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:              SendDefaultMenu_guard_shattrath(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_BANK:          SendBankMenu_guard_shattrath(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_INN:           SendInnMenu_guard_shattrath(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_STABLEMASTER:  SendStableMasterMenu_guard_shattrath(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_GEMMERCHANT:   SendGemMerchantMenu_guard_shattrath(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_MAILBOX:       SendMailboxMenu_guard_shattrath(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:     SendProfTrainerMenu_guard_shattrath(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_BATTLEINFO:    SendBattleMasterMenu_guard_shattrath(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -2481,14 +2481,14 @@ struct TRINITY_DLL_DECL guard_shattrath_aldorAI : public guardAI
 
     uint32 Exile_Timer;
     uint32 Banish_Timer;
-    uint64 playerGUID;
+    uint64 PlayerGUID;
     bool CanTeleport;
 
     void Reset()
     {
         Banish_Timer = 5000;
         Exile_Timer = 8500;
-        playerGUID = 0;
+        PlayerGUID = 0;
         CanTeleport = false;
     }
 
@@ -2496,32 +2496,32 @@ struct TRINITY_DLL_DECL guard_shattrath_aldorAI : public guardAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if( CanTeleport )
+        if (CanTeleport)
         {
-            if( Exile_Timer < diff )
+            if (Exile_Timer < diff)
             {
-                if( Unit* temp = Unit::GetUnit(*m_creature,playerGUID) )
+                if (Unit* temp = Unit::GetUnit(*m_creature,PlayerGUID))
                 {
                     temp->CastSpell(temp,SPELL_EXILE,true);
                     temp->CastSpell(temp,SPELL_BANISH_TELEPORT,true);
                 }
-                playerGUID = 0;
+                PlayerGUID = 0;
                 Exile_Timer = 8500;
                 CanTeleport = false;
             }else Exile_Timer -= diff;
         }
-        else if( Banish_Timer < diff )
+        else if (Banish_Timer < diff)
         {
             Unit* temp = m_creature->getVictim();
-            if( temp && temp->GetTypeId() == TYPEID_PLAYER )
+            if (temp && temp->GetTypeId() == TYPEID_PLAYER)
             {
                 DoCast(temp,SPELL_BANISHED_SHATTRATH_A);
                 Banish_Timer = 9000;
-                playerGUID = temp->GetGUID();
-                if( playerGUID )
+                PlayerGUID = temp->GetGUID();
+                if (PlayerGUID)
                     CanTeleport = true;
             }
         }else Banish_Timer -= diff;
@@ -2530,130 +2530,130 @@ struct TRINITY_DLL_DECL guard_shattrath_aldorAI : public guardAI
     }
 };
 
-bool GossipHello_guard_shattrath_aldor(Player *player, Creature *_Creature)
-{
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAVERN                       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK                         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN                          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FLIGHTMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX                      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER                  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MANALOOM                     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMYLAB                   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMMERCHANT                  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-    player->SEND_GOSSIP_MENU(10524, _Creature->GetGUID());
+bool GossipHello_guard_shattrath_aldor(Player* pPlayer, Creature *_Creature)
+{
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAVERN                       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK                         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN                          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FLIGHTMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX                      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER                  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MANALOOM                     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMYLAB                   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMMERCHANT                  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+    pPlayer->SEND_GOSSIP_MENU(10524, _Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_shattrath_aldor(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_shattrath_aldor(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Tavern
-            player->SEND_POI(-1759.5, 5165, 7, 6, 0, "Worlds End Tavern");
-            player->SEND_GOSSIP_MENU(10394, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1759.5, 5165, 7, 6, 0, "Worlds End Tavern");
+            pPlayer->SEND_GOSSIP_MENU(10394, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Bank
-            player->SEND_POI(-1730.5, 5496, 7, 6, 0, "Aldor Bank");
-            player->SEND_GOSSIP_MENU(10380, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1730.5, 5496, 7, 6, 0, "Aldor Bank");
+            pPlayer->SEND_GOSSIP_MENU(10380, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Inn
-            player->SEND_POI(-1895, 5767, 7, 6, 0, "Aldor Inn");
-            player->SEND_GOSSIP_MENU(10525,  _Creature->GetGUID());
+            pPlayer->SEND_POI(-1895, 5767, 7, 6, 0, "Aldor Inn");
+            pPlayer->SEND_GOSSIP_MENU(10525,  _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Flight master
-            player->SEND_POI(-1832, 5299, 7, 6, 0, "Shattrath Flight Master");
-            player->SEND_GOSSIP_MENU(10402, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1832, 5299, 7, 6, 0, "Shattrath Flight Master");
+            pPlayer->SEND_GOSSIP_MENU(10402, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Mailbox
-            player->SEND_POI(0, 0, 7, 6, 0, "Aldor Mailbox");
+            pPlayer->SEND_POI(0, 0, 7, 6, 0, "Aldor Mailbox");
                                                             //unknown
-            player->SEND_GOSSIP_MENU(10524, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(10524, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Stable master
-            player->SEND_POI(-1888.5, 5761, 7, 6, 0, "Aldor Stable Master");
-            player->SEND_GOSSIP_MENU(10527, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1888.5, 5761, 7, 6, 0, "Aldor Stable Master");
+            pPlayer->SEND_GOSSIP_MENU(10527, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Battlemaster
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERALLIANCE , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERHORDE    , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERARENA    , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(10388, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERALLIANCE , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERHORDE    , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERARENA    , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(10388, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Profession master
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->SEND_GOSSIP_MENU(10391, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->SEND_GOSSIP_MENU(10391, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Mana Loom
-            player->SEND_POI(-2070, 5265.5, 7, 6, 0, "Mana Loom");
-            player->SEND_GOSSIP_MENU(10522, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2070, 5265.5, 7, 6, 0, "Mana Loom");
+            pPlayer->SEND_GOSSIP_MENU(10522, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Alchemy Lab
-            player->SEND_POI(-1648.5, 5540, 7, 6, 0, "Alchemy Lab");
-            player->SEND_GOSSIP_MENU(10696, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1648.5, 5540, 7, 6, 0, "Alchemy Lab");
+            pPlayer->SEND_GOSSIP_MENU(10696, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Gem Merchant
-            player->SEND_POI(-1645, 5669.5, 7, 6, 0, "Aldor Gem Merchant");
-            player->SEND_GOSSIP_MENU(10411, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1645, 5669.5, 7, 6, 0, "Aldor Gem Merchant");
+            pPlayer->SEND_GOSSIP_MENU(10411, _Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_shattrath_aldor(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_shattrath_aldor(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(-1648.5, 5534, 7, 6, 0, "Lorokeem");
-            player->SEND_GOSSIP_MENU(10392, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1648.5, 5534, 7, 6, 0, "Lorokeem");
+            pPlayer->SEND_GOSSIP_MENU(10392, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(-1847, 5222, 7, 6, 0, "Kradu Grimblade and Zula Slagfury");
-            player->SEND_GOSSIP_MENU(10400, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1847, 5222, 7, 6, 0, "Kradu Grimblade and Zula Slagfury");
+            pPlayer->SEND_GOSSIP_MENU(10400, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(-2067.4, 5316.5, 7, 6, 0, "Jack Trapper");
-            player->SEND_GOSSIP_MENU(10393, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2067.4, 5316.5, 7, 6, 0, "Jack Trapper");
+            pPlayer->SEND_GOSSIP_MENU(10393, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_POI(-2263.5, 5563.5, 7, 6, 0, "High Enchanter Bardolan");
-            player->SEND_GOSSIP_MENU(10528, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2263.5, 5563.5, 7, 6, 0, "High Enchanter Bardolan");
+            pPlayer->SEND_GOSSIP_MENU(10528, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //First Aid
-            player->SEND_POI(-1591, 5265.5, 7, 6, 0, "Mildred Fletcher");
-            player->SEND_GOSSIP_MENU(10396, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1591, 5265.5, 7, 6, 0, "Mildred Fletcher");
+            pPlayer->SEND_GOSSIP_MENU(10396, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Jewelcrafting
-            player->SEND_POI(-1654, 5667.5, 7, 6, 0, "Hamanar");
-            player->SEND_GOSSIP_MENU(10529, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1654, 5667.5, 7, 6, 0, "Hamanar");
+            pPlayer->SEND_GOSSIP_MENU(10529, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Leatherworking
-            player->SEND_POI(-2060.5, 5256.5, 7, 6, 0, "Darmari");
-            player->SEND_GOSSIP_MENU(10399, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2060.5, 5256.5, 7, 6, 0, "Darmari");
+            pPlayer->SEND_GOSSIP_MENU(10399, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Skinning
-            player->SEND_POI(-2048, 5300, 7, 6, 0, "Seymour");
-            player->SEND_GOSSIP_MENU(10419, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2048, 5300, 7, 6, 0, "Seymour");
+            pPlayer->SEND_GOSSIP_MENU(10419, _Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_shattrath_aldor(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_shattrath_aldor(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_shattrath_aldor(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_shattrath_aldor(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_shattrath(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_shattrath_aldor(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_shattrath_aldor(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_shattrath(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -2677,14 +2677,14 @@ struct TRINITY_DLL_DECL guard_shattrath_scryerAI : public guardAI
 
     uint32 Exile_Timer;
     uint32 Banish_Timer;
-    uint64 playerGUID;
+    uint64 PlayerGUID;
     bool CanTeleport;
 
     void Reset()
     {
         Banish_Timer = 5000;
         Exile_Timer = 8500;
-        playerGUID = 0;
+        PlayerGUID = 0;
         CanTeleport = false;
     }
 
@@ -2692,32 +2692,32 @@ struct TRINITY_DLL_DECL guard_shattrath_scryerAI : public guardAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if( CanTeleport )
+        if (CanTeleport)
         {
-            if( Exile_Timer < diff )
+            if (Exile_Timer < diff)
             {
-                if( Unit* temp = Unit::GetUnit(*m_creature,playerGUID) )
+                if (Unit* temp = Unit::GetUnit(*m_creature,PlayerGUID))
                 {
                     temp->CastSpell(temp,SPELL_EXILE,true);
                     temp->CastSpell(temp,SPELL_BANISH_TELEPORT,true);
                 }
-                playerGUID = 0;
+                PlayerGUID = 0;
                 Exile_Timer = 8500;
                 CanTeleport = false;
             }else Exile_Timer -= diff;
         }
-        else if( Banish_Timer < diff )
+        else if (Banish_Timer < diff)
         {
             Unit* temp = m_creature->getVictim();
-            if( temp && temp->GetTypeId() == TYPEID_PLAYER )
+            if (temp && temp->GetTypeId() == TYPEID_PLAYER)
             {
                 DoCast(temp,SPELL_BANISHED_SHATTRATH_S);
                 Banish_Timer = 9000;
-                playerGUID = temp->GetGUID();
-                if( playerGUID )
+                PlayerGUID = temp->GetGUID();
+                if (PlayerGUID)
                     CanTeleport = true;
             }
         }else Banish_Timer -= diff;
@@ -2726,129 +2726,129 @@ struct TRINITY_DLL_DECL guard_shattrath_scryerAI : public guardAI
     }
 };
 
-bool GossipHello_guard_shattrath_scryer(Player *player, Creature *_Creature)
-{
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAVERN                       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK                         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN                          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FLIGHTMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX                      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER                  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MANALOOM                     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMYLAB                   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMMERCHANT                  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-    player->SEND_GOSSIP_MENU(10430, _Creature->GetGUID());
+bool GossipHello_guard_shattrath_scryer(Player* pPlayer, Creature *_Creature)
+{
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAVERN                       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK                         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN                          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FLIGHTMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX                      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER                 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER                  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MANALOOM                     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMYLAB                   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GEMMERCHANT                  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+    pPlayer->SEND_GOSSIP_MENU(10430, _Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_shattrath_scryer(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_shattrath_scryer(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Tavern
-            player->SEND_POI(-1759.5, 5165, 7, 6, 0, "Worlds End Tavern");
-            player->SEND_GOSSIP_MENU(10431, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1759.5, 5165, 7, 6, 0, "Worlds End Tavern");
+            pPlayer->SEND_GOSSIP_MENU(10431, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Bank
-            player->SEND_POI(-1996.6, 5363.7, 7, 6, 0, "Scryer Bank");
-            player->SEND_GOSSIP_MENU(10432, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1996.6, 5363.7, 7, 6, 0, "Scryer Bank");
+            pPlayer->SEND_GOSSIP_MENU(10432, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Inn
-            player->SEND_POI(-2176.6, 5405.8, 7, 6, 0, "Scryer Inn");
-            player->SEND_GOSSIP_MENU(10433,  _Creature->GetGUID());
+            pPlayer->SEND_POI(-2176.6, 5405.8, 7, 6, 0, "Scryer Inn");
+            pPlayer->SEND_GOSSIP_MENU(10433,  _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Flight master
-            player->SEND_POI(-1832, 5299, 7, 6, 0, "Shattrath Flight Master");
-            player->SEND_GOSSIP_MENU(10435, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1832, 5299, 7, 6, 0, "Shattrath Flight Master");
+            pPlayer->SEND_GOSSIP_MENU(10435, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Mailbox
-            player->SEND_POI(-2174.3, 5411.4, 7, 6, 0, "Scryer Mailbox");
-            player->SEND_GOSSIP_MENU(10436, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2174.3, 5411.4, 7, 6, 0, "Scryer Mailbox");
+            pPlayer->SEND_GOSSIP_MENU(10436, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Stable master
-            player->SEND_POI(-2169.9, 5405.1, 7, 6, 0, "Scryer Stable Master");
-            player->SEND_GOSSIP_MENU(10437, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2169.9, 5405.1, 7, 6, 0, "Scryer Stable Master");
+            pPlayer->SEND_GOSSIP_MENU(10437, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Battlemaster
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERALLIANCE , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERHORDE    , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERARENA    , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(10438, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERALLIANCE , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERHORDE    , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTERARENA    , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(10438, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Profession master
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->SEND_GOSSIP_MENU(10504, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->SEND_GOSSIP_MENU(10504, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Mana Loom
-            player->SEND_POI(-2070, 5265.5, 7, 6, 0, "Mana Loom");
-            player->SEND_GOSSIP_MENU(10522, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2070, 5265.5, 7, 6, 0, "Mana Loom");
+            pPlayer->SEND_GOSSIP_MENU(10522, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Alchemy Lab
-            player->SEND_POI(-1648.5, 5540, 7, 6, 0, "Alchemy Lab");
-            player->SEND_GOSSIP_MENU(10701, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1648.5, 5540, 7, 6, 0, "Alchemy Lab");
+            pPlayer->SEND_GOSSIP_MENU(10701, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Gem Merchant
-            player->SEND_POI(-1645, 5669.5, 7, 6, 0, "Scryer Gem Merchant");
-            player->SEND_GOSSIP_MENU(10702, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1645, 5669.5, 7, 6, 0, "Scryer Gem Merchant");
+            pPlayer->SEND_GOSSIP_MENU(10702, _Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_shattrath_scryer(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_shattrath_scryer(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(-1648.5, 5534, 7, 6, 0, "Lorokeem");
-            player->SEND_GOSSIP_MENU(10516, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1648.5, 5534, 7, 6, 0, "Lorokeem");
+            pPlayer->SEND_GOSSIP_MENU(10516, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(-1847, 5222, 7, 6, 0, "Kradu Grimblade and Zula Slagfury");
-            player->SEND_GOSSIP_MENU(10517, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1847, 5222, 7, 6, 0, "Kradu Grimblade and Zula Slagfury");
+            pPlayer->SEND_GOSSIP_MENU(10517, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(-2067.4, 5316.5, 7, 6, 0, "Jack Trapper");
-            player->SEND_GOSSIP_MENU(10518, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2067.4, 5316.5, 7, 6, 0, "Jack Trapper");
+            pPlayer->SEND_GOSSIP_MENU(10518, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_POI(-2263.5, 5563.5, 7, 6, 0, "High Enchanter Bardolan");
-            player->SEND_GOSSIP_MENU(10519, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2263.5, 5563.5, 7, 6, 0, "High Enchanter Bardolan");
+            pPlayer->SEND_GOSSIP_MENU(10519, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //First Aid
-            player->SEND_POI(-1591, 5265.5, 7, 6, 0, "Mildred Fletcher");
-            player->SEND_GOSSIP_MENU(10520, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1591, 5265.5, 7, 6, 0, "Mildred Fletcher");
+            pPlayer->SEND_GOSSIP_MENU(10520, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Jewelcrafting
-            player->SEND_POI(-1654, 5667.5, 7, 6, 0, "Hamanar");
-            player->SEND_GOSSIP_MENU(10521, _Creature->GetGUID());
+            pPlayer->SEND_POI(-1654, 5667.5, 7, 6, 0, "Hamanar");
+            pPlayer->SEND_GOSSIP_MENU(10521, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Leatherworking
-            player->SEND_POI(-2060.5, 5256.5, 7, 6, 0, "Darmari");
-            player->SEND_GOSSIP_MENU(10523, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2060.5, 5256.5, 7, 6, 0, "Darmari");
+            pPlayer->SEND_GOSSIP_MENU(10523, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Skinning
-            player->SEND_POI(-2048, 5300, 7, 6, 0, "Seymour");
-            player->SEND_GOSSIP_MENU(10523, _Creature->GetGUID());
+            pPlayer->SEND_POI(-2048, 5300, 7, 6, 0, "Seymour");
+            pPlayer->SEND_GOSSIP_MENU(10523, _Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_shattrath_scryer(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_shattrath_scryer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_shattrath_scryer(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_shattrath_scryer(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_shattrath(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_shattrath_scryer(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_shattrath_scryer(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_shattrath(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -2866,257 +2866,257 @@ CreatureAI* GetAI_guard_shattrath_scryer(Creature *_Creature)
  * guard_silvermoon start
  *******************************************************/
 
-bool GossipHello_guard_silvermoon(Player *player, Creature *_Creature)
-{
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN            , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-    player->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
+bool GossipHello_guard_silvermoon(Player* pPlayer, Creature *_Creature)
+{
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN            , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WINDRIDER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+    pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_silvermoon(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Auction house
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AH_SILVERMOON_1 , GOSSIP_SENDER_SEC_AUCTIONHOUSE, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AH_SILVERMOON_2 , GOSSIP_SENDER_SEC_AUCTIONHOUSE, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(9317, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AH_SILVERMOON_1 , GOSSIP_SENDER_SEC_AUCTIONHOUSE, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AH_SILVERMOON_2 , GOSSIP_SENDER_SEC_AUCTIONHOUSE, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(9317, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Bank
-            player->SEND_POI(9808.4, -7488.16, 7, 6, 0, "Silvermoon Bank");
-            player->SEND_GOSSIP_MENU(9322, _Creature->GetGUID());
+            pPlayer->SEND_POI(9808.4, -7488.16, 7, 6, 0, "Silvermoon Bank");
+            pPlayer->SEND_GOSSIP_MENU(9322, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Guild master
-            player->SEND_POI(9474.97, -7345.21, 7, 6, 0, "Tandrine");
-            player->SEND_GOSSIP_MENU(9324, _Creature->GetGUID());
+            pPlayer->SEND_POI(9474.97, -7345.21, 7, 6, 0, "Tandrine");
+            pPlayer->SEND_GOSSIP_MENU(9324, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Inn
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN_SILVERMOON_1 , GOSSIP_SENDER_SEC_INN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN_SILVERMOON_2 , GOSSIP_SENDER_SEC_INN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(9602, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN_SILVERMOON_1 , GOSSIP_SENDER_SEC_INN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN_SILVERMOON_2 , GOSSIP_SENDER_SEC_INN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(9602, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Mailbox
-            player->SEND_POI(9658.33, -7492.17, 7, 6, 0, "Silvermoon Mailbox");
-            player->SEND_GOSSIP_MENU(9326, _Creature->GetGUID());
+            pPlayer->SEND_POI(9658.33, -7492.17, 7, 6, 0, "Silvermoon Mailbox");
+            pPlayer->SEND_GOSSIP_MENU(9326, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Stable master
-            player->SEND_POI(9904.95, -7404.31, 7, 6, 0, "Shalenn");
-            player->SEND_GOSSIP_MENU(9327, _Creature->GetGUID());
+            pPlayer->SEND_POI(9904.95, -7404.31, 7, 6, 0, "Shalenn");
+            pPlayer->SEND_GOSSIP_MENU(9327, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Weapon trainer
-            player->SEND_POI(9841.17, -7505.13, 7, 6, 0, "Ileda");
-            player->SEND_GOSSIP_MENU(9328, _Creature->GetGUID());
+            pPlayer->SEND_POI(9841.17, -7505.13, 7, 6, 0, "Ileda");
+            pPlayer->SEND_GOSSIP_MENU(9328, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Wind master
-            player->SEND_POI(9378.45, -7163.94, 7, 6, 0, "Silvermoon Wind Master");
-            player->SEND_GOSSIP_MENU(10181, _Creature->GetGUID());
+            pPlayer->SEND_POI(9378.45, -7163.94, 7, 6, 0, "Silvermoon Wind Master");
+            pPlayer->SEND_GOSSIP_MENU(10181, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Battlemaster
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY   , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARENA           , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_EYEOFTHESTORM   , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 5);
-            player->SEND_GOSSIP_MENU(9329, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY   , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARENA           , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_EYEOFTHESTORM   , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(9329, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                 , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->SEND_GOSSIP_MENU(9331, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                 , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(9331, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING               , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 13);
-            player->SEND_GOSSIP_MENU(9338, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_JEWELCRAFTING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING               , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 13);
+            pPlayer->SEND_GOSSIP_MENU(9338, _Creature->GetGUID());
             break;
     }
 }
 
-void SendAuctionhouseMenu_guard_silvermoon(Player *player, Creature *_Creature, uint32 action)
+void SendAuctionhouseMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)
     {
-        player->SEND_POI(9644.47, -7140.22, 7, 6, 0, "Western Auction House");
-        player->SEND_GOSSIP_MENU(9318, _Creature->GetGUID());
+        pPlayer->SEND_POI(9644.47, -7140.22, 7, 6, 0, "Western Auction House");
+        pPlayer->SEND_GOSSIP_MENU(9318, _Creature->GetGUID());
     }
     if (action == GOSSIP_ACTION_INFO_DEF + 2)
     {
-        player->SEND_POI(9683.27, -7521.22, 7, 6, 0, "Royal Exchange Auction House");
-        player->SEND_GOSSIP_MENU(9319, _Creature->GetGUID());
+        pPlayer->SEND_POI(9683.27, -7521.22, 7, 6, 0, "Royal Exchange Auction House");
+        pPlayer->SEND_GOSSIP_MENU(9319, _Creature->GetGUID());
     }
 }
 
-void SendInnMenu_guard_silvermoon(Player *player, Creature *_Creature, uint32 action)
+void SendInnMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)
     {
-        player->SEND_POI(9677.7, -7368, 7, 6, 0, "Silvermoon City Inn");
-        player->SEND_GOSSIP_MENU(9325, _Creature->GetGUID());
+        pPlayer->SEND_POI(9677.7, -7368, 7, 6, 0, "Silvermoon City Inn");
+        pPlayer->SEND_GOSSIP_MENU(9325, _Creature->GetGUID());
     }
     if (action == GOSSIP_ACTION_INFO_DEF + 2)
     {
-        player->SEND_POI(9561.1, -7517.5, 7, 6, 0, "Wayfarer's Rest tavern");
-        player->SEND_GOSSIP_MENU(9603, _Creature->GetGUID());
+        pPlayer->SEND_POI(9561.1, -7517.5, 7, 6, 0, "Wayfarer's Rest tavern");
+        pPlayer->SEND_GOSSIP_MENU(9603, _Creature->GetGUID());
     }
 }
 
-void SendBattleMasterMenu_guard_silvermoon(Player *player, Creature *_Creature, uint32 action)
+void SendBattleMasterMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //AV
-            player->SEND_POI(9850.49, -7572.26, 7, 6, 0, "Gurak");
-            player->SEND_GOSSIP_MENU(9329, _Creature->GetGUID());
+            pPlayer->SEND_POI(9850.49, -7572.26, 7, 6, 0, "Gurak");
+            pPlayer->SEND_GOSSIP_MENU(9329, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //AB
-            player->SEND_POI(9857.18, -7564.36, 7, 6, 0, "Karen Wentworth");
-            player->SEND_GOSSIP_MENU(9329,  _Creature->GetGUID());
+            pPlayer->SEND_POI(9857.18, -7564.36, 7, 6, 0, "Karen Wentworth");
+            pPlayer->SEND_GOSSIP_MENU(9329,  _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //A
-            player->SEND_POI(9850.6, -7559.25, 7, 6, 0, "Bipp Glizzitor");
-            player->SEND_GOSSIP_MENU(9329, _Creature->GetGUID());
+            pPlayer->SEND_POI(9850.6, -7559.25, 7, 6, 0, "Bipp Glizzitor");
+            pPlayer->SEND_GOSSIP_MENU(9329, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //EOS
-            player->SEND_POI(9857.18, -7564.36, 7, 6, 0, "Karen Wentworth");
-            player->SEND_GOSSIP_MENU(9329, _Creature->GetGUID());
+            pPlayer->SEND_POI(9857.18, -7564.36, 7, 6, 0, "Karen Wentworth");
+            pPlayer->SEND_GOSSIP_MENU(9329, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //WSG
-            player->SEND_POI(9845.45, -7562.58, 7, 6, 0, "Krukk");
-            player->SEND_GOSSIP_MENU(9329, _Creature->GetGUID());
+            pPlayer->SEND_POI(9845.45, -7562.58, 7, 6, 0, "Krukk");
+            pPlayer->SEND_GOSSIP_MENU(9329, _Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_silvermoon(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Druid
-            player->SEND_POI(9700.55, -7262.57, 7, 6, 0, "Harene Plainwalker");
-            player->SEND_GOSSIP_MENU(9330, _Creature->GetGUID());
+            pPlayer->SEND_POI(9700.55, -7262.57, 7, 6, 0, "Harene Plainwalker");
+            pPlayer->SEND_GOSSIP_MENU(9330, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Hunter
-            player->SEND_POI(9927.48, -7426.14, 7, 6, 0, "Zandine");
-            player->SEND_GOSSIP_MENU(9332, _Creature->GetGUID());
+            pPlayer->SEND_POI(9927.48, -7426.14, 7, 6, 0, "Zandine");
+            pPlayer->SEND_GOSSIP_MENU(9332, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Mage
-            player->SEND_POI(9995.07, -7118.17, 7, 6, 0, "Quithas");
-            player->SEND_GOSSIP_MENU(9333, _Creature->GetGUID());
+            pPlayer->SEND_POI(9995.07, -7118.17, 7, 6, 0, "Quithas");
+            pPlayer->SEND_GOSSIP_MENU(9333, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Paladin
-            player->SEND_POI(9850.22, -7516.93, 7, 6, 0, "Champion Bachi");
-            player->SEND_GOSSIP_MENU(9334, _Creature->GetGUID());
+            pPlayer->SEND_POI(9850.22, -7516.93, 7, 6, 0, "Champion Bachi");
+            pPlayer->SEND_GOSSIP_MENU(9334, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Priest
-            player->SEND_POI(9926.79, -7066.66, 7, 6, 0, "Belestra");
-            player->SEND_GOSSIP_MENU(9335, _Creature->GetGUID());
+            pPlayer->SEND_POI(9926.79, -7066.66, 7, 6, 0, "Belestra");
+            pPlayer->SEND_GOSSIP_MENU(9335, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Rogue
-            player->SEND_POI(9739.88, -7374.33, 7, 6, 0, "Zelanis");
-            player->SEND_GOSSIP_MENU(9336, _Creature->GetGUID());
+            pPlayer->SEND_POI(9739.88, -7374.33, 7, 6, 0, "Zelanis");
+            pPlayer->SEND_GOSSIP_MENU(9336, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Warlock
-            player->SEND_POI(9787.57, -7284.63, 7, 6, 0, "Alamma");
-            player->SEND_GOSSIP_MENU(9337, _Creature->GetGUID());
+            pPlayer->SEND_POI(9787.57, -7284.63, 7, 6, 0, "Alamma");
+            pPlayer->SEND_GOSSIP_MENU(9337, _Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_silvermoon(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(9998.09, -7214.36, 7, 6, 0, "Silvermoon Alchemy Trainer");
-            player->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
+            pPlayer->SEND_POI(9998.09, -7214.36, 7, 6, 0, "Silvermoon Alchemy Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(9841.43, -7361.53, 7, 6, 0, "Silvermoon Blacksmithing Trainer");
-            player->SEND_GOSSIP_MENU(9340, _Creature->GetGUID());
+            pPlayer->SEND_POI(9841.43, -7361.53, 7, 6, 0, "Silvermoon Blacksmithing Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9340, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(9577.26, -7243.6, 7, 6, 0, "Silvermoon Cooking Trainer");
-            player->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
+            pPlayer->SEND_POI(9577.26, -7243.6, 7, 6, 0, "Silvermoon Cooking Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_POI(9962.57, -7246.18, 7, 6, 0, "Silvermoon Enchanting Trainer");
-            player->SEND_GOSSIP_MENU(9341, _Creature->GetGUID());
+            pPlayer->SEND_POI(9962.57, -7246.18, 7, 6, 0, "Silvermoon Enchanting Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9341, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Engineering
-            player->SEND_POI(9820.18, -7329.56, 7, 6, 0, "Silvermoon Engineering Trainer");
-            player->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
+            pPlayer->SEND_POI(9820.18, -7329.56, 7, 6, 0, "Silvermoon Engineering Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //First Aid
-            player->SEND_POI(9579.8, -7343.71, 7, 6, 0, "Silvermoon First Aid Trainer");
-            player->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
+            pPlayer->SEND_POI(9579.8, -7343.71, 7, 6, 0, "Silvermoon First Aid Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Fishing
-            player->SEND_POI(9602.73, -7328.3, 7, 6, 0, "Silvermoon Fishing Trainer");
-            player->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
+            pPlayer->SEND_POI(9602.73, -7328.3, 7, 6, 0, "Silvermoon Fishing Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Jewelcrafting
-            player->SEND_POI(9553.54, -7506.43, 7, 6, 0, "Silvermoon Jewelcrafting Trainer");
-            player->SEND_GOSSIP_MENU(9346, _Creature->GetGUID());
+            pPlayer->SEND_POI(9553.54, -7506.43, 7, 6, 0, "Silvermoon Jewelcrafting Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9346, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Herbalism
-            player->SEND_POI(10004.4, -7216.86, 7, 6, 0, "Silvermoon Herbalism Trainer");
-            player->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
+            pPlayer->SEND_POI(10004.4, -7216.86, 7, 6, 0, "Silvermoon Herbalism Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Leatherworking
-            player->SEND_POI(9503.72, -7430.16, 7, 6, 0, "Silvermoon Leatherworking Trainer");
-            player->SEND_GOSSIP_MENU(9347, _Creature->GetGUID());
+            pPlayer->SEND_POI(9503.72, -7430.16, 7, 6, 0, "Silvermoon Leatherworking Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9347, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Mining
-            player->SEND_POI(9805.1, -7355.56, 7, 6, 0, "Silvermoon Mining Trainer");
-            player->SEND_GOSSIP_MENU(9348, _Creature->GetGUID());
+            pPlayer->SEND_POI(9805.1, -7355.56, 7, 6, 0, "Silvermoon Mining Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9348, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Skinning
-            player->SEND_POI(9513.37, -7429.4, 7, 6, 0, "Silvermoon Skinning Trainer");
-            player->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
+            pPlayer->SEND_POI(9513.37, -7429.4, 7, 6, 0, "Silvermoon Skinning Trainer");
+            pPlayer->SEND_GOSSIP_MENU(9316, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 13:                   //Tailoring
-            player->SEND_POI(9750.55, -7095.28, 7, 6, 0, "Silvermoon Tailor");
-            player->SEND_GOSSIP_MENU(9350, _Creature->GetGUID());
+            pPlayer->SEND_POI(9750.55, -7095.28, 7, 6, 0, "Silvermoon Tailor");
+            pPlayer->SEND_GOSSIP_MENU(9350, _Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_silvermoon(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_silvermoon(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:                SendDefaultMenu_guard_silvermoon(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_AUCTIONHOUSE:    SendAuctionhouseMenu_guard_silvermoon(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_INN:             SendInnMenu_guard_silvermoon(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:      SendClassTrainerMenu_guard_silvermoon(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:       SendProfTrainerMenu_guard_silvermoon(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_BATTLEINFO:      SendBattleMasterMenu_guard_silvermoon(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:                SendDefaultMenu_guard_silvermoon(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_AUCTIONHOUSE:    SendAuctionhouseMenu_guard_silvermoon(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_INN:             SendInnMenu_guard_silvermoon(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:      SendClassTrainerMenu_guard_silvermoon(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:       SendProfTrainerMenu_guard_silvermoon(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_BATTLEINFO:      SendBattleMasterMenu_guard_silvermoon(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -3134,231 +3134,231 @@ CreatureAI* GetAI_guard_silvermoon(Creature *_Creature)
  * guard_stormwind start
  *******************************************************/
 
-bool GossipHello_guard_stormwind(Player *player, Creature *_Creature)
-{
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STORMWIND_BANK    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DEEPRUNTRAM       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN               , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GRYPHON           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_OFFICERS          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
-    player->SEND_GOSSIP_MENU(933,_Creature->GetGUID());
+bool GossipHello_guard_stormwind(Player* pPlayer, Creature *_Creature)
+{
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STORMWIND_BANK    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DEEPRUNTRAM       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN               , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GRYPHON           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_OFFICERS          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
+    pPlayer->SEND_GOSSIP_MENU(933,_Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_stormwind(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_stormwind(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Auction House
-            player->SEND_POI(-8811.46, 667.46, 7, 6, 0, "Stormwind Auction House");
-            player->SEND_GOSSIP_MENU(3834,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8811.46, 667.46, 7, 6, 0, "Stormwind Auction House");
+            pPlayer->SEND_GOSSIP_MENU(3834,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Bank
-            player->SEND_POI(-8916.87, 622.87, 7, 6, 0, "Stormwind Bank");
-            player->SEND_GOSSIP_MENU(764,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8916.87, 622.87, 7, 6, 0, "Stormwind Bank");
+            pPlayer->SEND_GOSSIP_MENU(764,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Deeprun tram
-            player->SEND_POI(-8378.88, 554.23, 7, 6, 0, "The Deeprun Tram");
-            player->SEND_GOSSIP_MENU(3813,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8378.88, 554.23, 7, 6, 0, "The Deeprun Tram");
+            pPlayer->SEND_GOSSIP_MENU(3813,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Inn
-            player->SEND_POI(-8869.0, 675.4, 7, 6, 0, "The Gilded Rose");
-            player->SEND_GOSSIP_MENU(3860,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8869.0, 675.4, 7, 6, 0, "The Gilded Rose");
+            pPlayer->SEND_GOSSIP_MENU(3860,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Gryphon Master
-            player->SEND_POI(-8837.0, 493.5, 7, 6, 0, "Stormwind Gryphon Master");
-            player->SEND_GOSSIP_MENU(879,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8837.0, 493.5, 7, 6, 0, "Stormwind Gryphon Master");
+            pPlayer->SEND_GOSSIP_MENU(879,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Guild Master
-            player->SEND_POI(-8894.0, 611.2, 7, 6, 0, "Stormwind Vistor`s Center");
-            player->SEND_GOSSIP_MENU(882,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8894.0, 611.2, 7, 6, 0, "Stormwind Vistor`s Center");
+            pPlayer->SEND_GOSSIP_MENU(882,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Mailbox
-            player->SEND_POI(-8876.48, 649.18, 7, 6, 0, "Stormwind Mailbox");
-            player->SEND_GOSSIP_MENU(3861,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8876.48, 649.18, 7, 6, 0, "Stormwind Mailbox");
+            pPlayer->SEND_GOSSIP_MENU(3861,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Stable Master
-            player->SEND_POI(-8433.0, 554.7, 7, 6, 0, "Jenova Stoneshield");
-            player->SEND_GOSSIP_MENU(5984,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8433.0, 554.7, 7, 6, 0, "Jenova Stoneshield");
+            pPlayer->SEND_GOSSIP_MENU(5984,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Weapon Trainer
-            player->SEND_POI(-8797.0, 612.8, 7, 6, 0, "Woo Ping");
-            player->SEND_GOSSIP_MENU(4516,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8797.0, 612.8, 7, 6, 0, "Woo Ping");
+            pPlayer->SEND_GOSSIP_MENU(4516,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Officers Lounge
-            player->SEND_POI(-8759.92, 399.69, 7, 6, 0, "Champions` Hall");
-            player->SEND_GOSSIP_MENU(7047,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8759.92, 399.69, 7, 6, 0, "Champions` Hall");
+            pPlayer->SEND_GOSSIP_MENU(7047,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Battlemasters
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY        , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN          , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH          , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(7499,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY        , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN          , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH          , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(7499,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Class trainers
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                 , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->SEND_GOSSIP_MENU(898,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                 , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PALADIN              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SHAMAN               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->SEND_GOSSIP_MENU(898,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 13:                   //Profession trainers
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING               , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->SEND_GOSSIP_MENU(918,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING               , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->SEND_GOSSIP_MENU(918,_Creature->GetGUID());
             break;
     }
 }
 
-void SendBattleMasterMenu_guard_stormwind(Player *player, Creature *_Creature, uint32 action)
+void SendBattleMasterMenu_guard_stormwind(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //AV
-            player->SEND_POI(-8443.88, 335.99, 7, 6, 0, "Thelman Slatefist");
-            player->SEND_GOSSIP_MENU(7500, _Creature->GetGUID());
+            pPlayer->SEND_POI(-8443.88, 335.99, 7, 6, 0, "Thelman Slatefist");
+            pPlayer->SEND_GOSSIP_MENU(7500, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //AB
-            player->SEND_POI(-8443.88, 335.99, 7, 6, 0, "Lady Hoteshem");
-            player->SEND_GOSSIP_MENU(7650, _Creature->GetGUID());
+            pPlayer->SEND_POI(-8443.88, 335.99, 7, 6, 0, "Lady Hoteshem");
+            pPlayer->SEND_GOSSIP_MENU(7650, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //WSG
-            player->SEND_POI(-8443.88, 335.99, 7, 6, 0, "Elfarran");
-            player->SEND_GOSSIP_MENU(7501, _Creature->GetGUID());
+            pPlayer->SEND_POI(-8443.88, 335.99, 7, 6, 0, "Elfarran");
+            pPlayer->SEND_GOSSIP_MENU(7501, _Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_stormwind(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_stormwind(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Mage
-            player->SEND_POI(-9012.0, 867.6, 7, 6, 0, "Wizard`s Sanctum");
-            player->SEND_GOSSIP_MENU(899,_Creature->GetGUID());
+            pPlayer->SEND_POI(-9012.0, 867.6, 7, 6, 0, "Wizard`s Sanctum");
+            pPlayer->SEND_GOSSIP_MENU(899,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Rogue
-            player->SEND_POI(-8753.0, 367.8, 7, 6, 0, "Stormwind - Rogue House");
-            player->SEND_GOSSIP_MENU(900,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8753.0, 367.8, 7, 6, 0, "Stormwind - Rogue House");
+            pPlayer->SEND_GOSSIP_MENU(900,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Warrior
-            player->SEND_POI(-8690.11, 324.85, 7, 6, 0, "Command Center");
-            player->SEND_GOSSIP_MENU(901,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8690.11, 324.85, 7, 6, 0, "Command Center");
+            pPlayer->SEND_GOSSIP_MENU(901,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Druid
-            player->SEND_POI(-8751.0, 1124.5, 7, 6, 0, "The Park");
-            player->SEND_GOSSIP_MENU(902,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8751.0, 1124.5, 7, 6, 0, "The Park");
+            pPlayer->SEND_GOSSIP_MENU(902,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Priest
-            player->SEND_POI(-8512.0, 862.4, 7, 6, 0, "Catedral Of Light");
-            player->SEND_GOSSIP_MENU(903,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8512.0, 862.4, 7, 6, 0, "Catedral Of Light");
+            pPlayer->SEND_GOSSIP_MENU(903,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Paladin
-            player->SEND_POI(-8577.0, 881.7, 7, 6, 0, "Catedral Of Light");
-            player->SEND_GOSSIP_MENU(904,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8577.0, 881.7, 7, 6, 0, "Catedral Of Light");
+            pPlayer->SEND_GOSSIP_MENU(904,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Hunter
-            player->SEND_POI(-8413.0, 541.5, 7, 6, 0, "Hunter Lodge");
-            player->SEND_GOSSIP_MENU(905,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8413.0, 541.5, 7, 6, 0, "Hunter Lodge");
+            pPlayer->SEND_GOSSIP_MENU(905,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Warlock
-            player->SEND_POI(-8948.91, 998.35, 7, 6, 0, "The Slaughtered Lamb");
-            player->SEND_GOSSIP_MENU(906,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8948.91, 998.35, 7, 6, 0, "The Slaughtered Lamb");
+            pPlayer->SEND_GOSSIP_MENU(906,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Shaman
-            player->SEND_POI(-9033, 550, 7, 6, 0, "Valley Of Heroes");
+            pPlayer->SEND_POI(-9033, 550, 7, 6, 0, "Valley Of Heroes");
                                                             //incorrect id
-            player->SEND_GOSSIP_MENU(2593,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(2593,_Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_stormwind(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_stormwind(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(-8988.0, 759.60, 7, 6, 0, "Alchemy Needs");
-            player->SEND_GOSSIP_MENU(919,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8988.0, 759.60, 7, 6, 0, "Alchemy Needs");
+            pPlayer->SEND_GOSSIP_MENU(919,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(-8424.0, 616.9, 7, 6, 0, "Therum Deepforge");
-            player->SEND_GOSSIP_MENU(920,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8424.0, 616.9, 7, 6, 0, "Therum Deepforge");
+            pPlayer->SEND_GOSSIP_MENU(920,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(-8611.0, 364.6, 7, 6, 0, "Pig and Whistle Tavern");
-            player->SEND_GOSSIP_MENU(921,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8611.0, 364.6, 7, 6, 0, "Pig and Whistle Tavern");
+            pPlayer->SEND_GOSSIP_MENU(921,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_POI(-8858.0, 803.7, 7, 6, 0, "Lucan Cordell");
-            player->SEND_GOSSIP_MENU(941,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8858.0, 803.7, 7, 6, 0, "Lucan Cordell");
+            pPlayer->SEND_GOSSIP_MENU(941,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Engineering
-            player->SEND_POI(-8347.0, 644.1, 7, 6, 0, "Lilliam Sparkspindle");
-            player->SEND_GOSSIP_MENU(922,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8347.0, 644.1, 7, 6, 0, "Lilliam Sparkspindle");
+            pPlayer->SEND_GOSSIP_MENU(922,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //First Aid
-            player->SEND_POI(-8513.0, 801.8, 7, 6, 0, "Shaina Fuller");
-            player->SEND_GOSSIP_MENU(923,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8513.0, 801.8, 7, 6, 0, "Shaina Fuller");
+            pPlayer->SEND_GOSSIP_MENU(923,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Fishing
-            player->SEND_POI(-8803.0, 767.5, 7, 6, 0, "Arnold Leland");
-            player->SEND_GOSSIP_MENU(940,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8803.0, 767.5, 7, 6, 0, "Arnold Leland");
+            pPlayer->SEND_GOSSIP_MENU(940,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Herbalism
-            player->SEND_POI(-8967.0, 779.5, 7, 6, 0, "Alchemy Needs");
-            player->SEND_GOSSIP_MENU(924,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8967.0, 779.5, 7, 6, 0, "Alchemy Needs");
+            pPlayer->SEND_GOSSIP_MENU(924,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Leatherworking
-            player->SEND_POI(-8726.0, 477.4, 7, 6, 0, "The Protective Hide");
-            player->SEND_GOSSIP_MENU(925,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8726.0, 477.4, 7, 6, 0, "The Protective Hide");
+            pPlayer->SEND_GOSSIP_MENU(925,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Mining
-            player->SEND_POI(-8434.0, 692.8, 7, 6, 0, "Gelman Stonehand");
-            player->SEND_GOSSIP_MENU(927,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8434.0, 692.8, 7, 6, 0, "Gelman Stonehand");
+            pPlayer->SEND_GOSSIP_MENU(927,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Skinning
-            player->SEND_POI(-8716.0, 469.4, 7, 6, 0, "The Protective Hide");
-            player->SEND_GOSSIP_MENU(928,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8716.0, 469.4, 7, 6, 0, "The Protective Hide");
+            pPlayer->SEND_GOSSIP_MENU(928,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Tailoring
-            player->SEND_POI(-8938.0, 800.7, 7, 6, 0, "Duncan`s Textiles");
-            player->SEND_GOSSIP_MENU(929,_Creature->GetGUID());
+            pPlayer->SEND_POI(-8938.0, 800.7, 7, 6, 0, "Duncan`s Textiles");
+            pPlayer->SEND_GOSSIP_MENU(929,_Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_stormwind(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_stormwind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_stormwind(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_stormwind(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_stormwind(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_stormwind(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_stormwind(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_stormwind(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_stormwind(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_stormwind(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -3376,138 +3376,138 @@ CreatureAI* GetAI_guard_stormwind(Creature *_Creature)
  * guard_teldrassil start
  *******************************************************/
 
-bool GossipHello_guard_teldrassil(Player *player, Creature *_Creature)
+bool GossipHello_guard_teldrassil(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FERRY        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->SEND_GOSSIP_MENU(4316,_Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK         , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FERRY        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->SEND_GOSSIP_MENU(4316,_Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_teldrassil(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_teldrassil(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Bank
-            player->SEND_GOSSIP_MENU(4317,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4317,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Rut`theran
-            player->SEND_GOSSIP_MENU(4318,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4318,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Guild master
-            player->SEND_GOSSIP_MENU(4319,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4319,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Inn
-            player->SEND_POI(9821.49, 960.13, 7, 6, 0, "Dolanaar Inn");
-            player->SEND_GOSSIP_MENU(4320,_Creature->GetGUID());
+            pPlayer->SEND_POI(9821.49, 960.13, 7, 6, 0, "Dolanaar Inn");
+            pPlayer->SEND_GOSSIP_MENU(4320,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //stable master
-            player->SEND_POI(9808.37, 931.1, 7, 6, 0, "Seriadne");
-            player->SEND_GOSSIP_MENU(5982,_Creature->GetGUID());
+            pPlayer->SEND_POI(9808.37, 931.1, 7, 6, 0, "Seriadne");
+            pPlayer->SEND_GOSSIP_MENU(5982,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->SEND_GOSSIP_MENU(4264,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_DRUID                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HUNTER               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(4264,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->SEND_GOSSIP_MENU(4273,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->SEND_GOSSIP_MENU(4273,_Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_teldrassil(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_teldrassil(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Druid
-            player->SEND_POI(9741.58, 963.7, 7, 6, 0, "Kal");
-            player->SEND_GOSSIP_MENU(4323,_Creature->GetGUID());
+            pPlayer->SEND_POI(9741.58, 963.7, 7, 6, 0, "Kal");
+            pPlayer->SEND_GOSSIP_MENU(4323,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Hunter
-            player->SEND_POI(9815.12, 926.28, 7, 6, 0, "Dazalar");
-            player->SEND_GOSSIP_MENU(4324,_Creature->GetGUID());
+            pPlayer->SEND_POI(9815.12, 926.28, 7, 6, 0, "Dazalar");
+            pPlayer->SEND_GOSSIP_MENU(4324,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Priest
-            player->SEND_POI(9906.16, 986.63, 7, 6, 0, "Laurna Morninglight");
-            player->SEND_GOSSIP_MENU(4325,_Creature->GetGUID());
+            pPlayer->SEND_POI(9906.16, 986.63, 7, 6, 0, "Laurna Morninglight");
+            pPlayer->SEND_GOSSIP_MENU(4325,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Rogue
-            player->SEND_POI(9789, 942.86, 7, 6, 0, "Jannok Breezesong");
-            player->SEND_GOSSIP_MENU(4326,_Creature->GetGUID());
+            pPlayer->SEND_POI(9789, 942.86, 7, 6, 0, "Jannok Breezesong");
+            pPlayer->SEND_GOSSIP_MENU(4326,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Warrior
-            player->SEND_POI(9821.96, 950.61, 7, 6, 0, "Kyra Windblade");
-            player->SEND_GOSSIP_MENU(4327,_Creature->GetGUID());
+            pPlayer->SEND_POI(9821.96, 950.61, 7, 6, 0, "Kyra Windblade");
+            pPlayer->SEND_GOSSIP_MENU(4327,_Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_teldrassil(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_teldrassil(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(9767.59, 878.81, 7, 6, 0, "Cyndra Kindwhisper");
-            player->SEND_GOSSIP_MENU(4329,_Creature->GetGUID());
+            pPlayer->SEND_POI(9767.59, 878.81, 7, 6, 0, "Cyndra Kindwhisper");
+            pPlayer->SEND_GOSSIP_MENU(4329,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Cooking
-            player->SEND_POI(9751.19, 906.13, 7, 6, 0, "Zarrin");
-            player->SEND_GOSSIP_MENU(4330,_Creature->GetGUID());
+            pPlayer->SEND_POI(9751.19, 906.13, 7, 6, 0, "Zarrin");
+            pPlayer->SEND_GOSSIP_MENU(4330,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Enchanting
-            player->SEND_POI(10677.59, 1946.56, 7, 6, 0, "Alanna Raveneye");
-            player->SEND_GOSSIP_MENU(4331,_Creature->GetGUID());
+            pPlayer->SEND_POI(10677.59, 1946.56, 7, 6, 0, "Alanna Raveneye");
+            pPlayer->SEND_GOSSIP_MENU(4331,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //First Aid
-            player->SEND_POI(9903.12, 999, 7, 6, 0, "Byancie");
-            player->SEND_GOSSIP_MENU(4332,_Creature->GetGUID());
+            pPlayer->SEND_POI(9903.12, 999, 7, 6, 0, "Byancie");
+            pPlayer->SEND_GOSSIP_MENU(4332,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Fishing
-            player->SEND_GOSSIP_MENU(4333,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4333,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Herbalism
-            player->SEND_POI(9773.78, 875.88, 7, 6, 0, "Malorne Bladeleaf");
-            player->SEND_GOSSIP_MENU(4334,_Creature->GetGUID());
+            pPlayer->SEND_POI(9773.78, 875.88, 7, 6, 0, "Malorne Bladeleaf");
+            pPlayer->SEND_GOSSIP_MENU(4334,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Leatherworking
-            player->SEND_POI(10152.59, 1681.46, 7, 6, 0, "Nadyia Maneweaver");
-            player->SEND_GOSSIP_MENU(4335,_Creature->GetGUID());
+            pPlayer->SEND_POI(10152.59, 1681.46, 7, 6, 0, "Nadyia Maneweaver");
+            pPlayer->SEND_GOSSIP_MENU(4335,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Skinning
-            player->SEND_POI(10135.59, 1673.18, 7, 6, 0, "Radnaal Maneweaver");
-            player->SEND_GOSSIP_MENU(4336,_Creature->GetGUID());
+            pPlayer->SEND_POI(10135.59, 1673.18, 7, 6, 0, "Radnaal Maneweaver");
+            pPlayer->SEND_GOSSIP_MENU(4336,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Tailoring
-            player->SEND_GOSSIP_MENU(4337,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4337,_Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_teldrassil(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_teldrassil(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_teldrassil(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_teldrassil(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_teldrassil(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_teldrassil(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_teldrassil(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_teldrassil(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -3525,147 +3525,147 @@ CreatureAI* GetAI_guard_teldrassil(Creature *_Creature)
  * guard_tirisfal start
  *******************************************************/
 
-bool GossipHello_guard_tirisfal(Player *player, Creature *_Creature)
+bool GossipHello_guard_tirisfal(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK            , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATHANDLER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN             , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->SEND_GOSSIP_MENU(4097,_Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK            , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATHANDLER      , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN             , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER     , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->SEND_GOSSIP_MENU(4097,_Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_tirisfal(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_tirisfal(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Bank
-            player->SEND_GOSSIP_MENU(4074,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4074,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //bat handler
-            player->SEND_GOSSIP_MENU(4075,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4075,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Inn
-            player->SEND_POI(2246.68, 241.89, 7, 6, 0, "Gallows` End Tavern");
-            player->SEND_GOSSIP_MENU(4076,_Creature->GetGUID());
+            pPlayer->SEND_POI(2246.68, 241.89, 7, 6, 0, "Gallows` End Tavern");
+            pPlayer->SEND_GOSSIP_MENU(4076,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Stable Master
-            player->SEND_POI(2267.66, 319.32, 7, 6, 0, "Morganus");
-            player->SEND_GOSSIP_MENU(5978,_Creature->GetGUID());
+            pPlayer->SEND_POI(2267.66, 319.32, 7, 6, 0, "Morganus");
+            pPlayer->SEND_GOSSIP_MENU(5978,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                 , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->SEND_GOSSIP_MENU(4292,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE                 , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST               , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE                , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR              , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(4292,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING               , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->SEND_GOSSIP_MENU(4096,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING           , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING              , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING               , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING             , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING            , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->SEND_GOSSIP_MENU(4096,_Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_tirisfal(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_tirisfal(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Mage
-            player->SEND_POI(2259.18, 240.93, 7, 6, 0, "Cain Firesong");
-            player->SEND_GOSSIP_MENU(4077,_Creature->GetGUID());
+            pPlayer->SEND_POI(2259.18, 240.93, 7, 6, 0, "Cain Firesong");
+            pPlayer->SEND_GOSSIP_MENU(4077,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Priest
-            player->SEND_POI(2259.18, 240.93, 7, 6, 0, "Dark Cleric Beryl");
-            player->SEND_GOSSIP_MENU(4078,_Creature->GetGUID());
+            pPlayer->SEND_POI(2259.18, 240.93, 7, 6, 0, "Dark Cleric Beryl");
+            pPlayer->SEND_GOSSIP_MENU(4078,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Rogue
-            player->SEND_POI(2259.18, 240.93, 7, 6, 0, "Marion Call");
-            player->SEND_GOSSIP_MENU(4079,_Creature->GetGUID());
+            pPlayer->SEND_POI(2259.18, 240.93, 7, 6, 0, "Marion Call");
+            pPlayer->SEND_GOSSIP_MENU(4079,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Warlock
-            player->SEND_POI(2259.18, 240.93, 7, 6, 0, "Rupert Boch");
-            player->SEND_GOSSIP_MENU(4080,_Creature->GetGUID());
+            pPlayer->SEND_POI(2259.18, 240.93, 7, 6, 0, "Rupert Boch");
+            pPlayer->SEND_GOSSIP_MENU(4080,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Warrior
-            player->SEND_POI(2256.48, 240.32, 7, 6, 0, "Austil de Mon");
-            player->SEND_GOSSIP_MENU(4081,_Creature->GetGUID());
+            pPlayer->SEND_POI(2256.48, 240.32, 7, 6, 0, "Austil de Mon");
+            pPlayer->SEND_GOSSIP_MENU(4081,_Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_tirisfal(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_tirisfal(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(2263.25, 344.23, 7, 6, 0, "Carolai Anise");
-            player->SEND_GOSSIP_MENU(4082,_Creature->GetGUID());
+            pPlayer->SEND_POI(2263.25, 344.23, 7, 6, 0, "Carolai Anise");
+            pPlayer->SEND_GOSSIP_MENU(4082,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_GOSSIP_MENU(4083,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4083,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_GOSSIP_MENU(4084,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4084,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_POI(2250.35, 249.12, 7, 6, 0, "Vance Undergloom");
-            player->SEND_GOSSIP_MENU(4085,_Creature->GetGUID());
+            pPlayer->SEND_POI(2250.35, 249.12, 7, 6, 0, "Vance Undergloom");
+            pPlayer->SEND_GOSSIP_MENU(4085,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Engineering
-            player->SEND_GOSSIP_MENU(4086,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4086,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //First Aid
-            player->SEND_POI(2246.68, 241.89, 7, 6, 0, "Nurse Neela");
-            player->SEND_GOSSIP_MENU(4087,_Creature->GetGUID());
+            pPlayer->SEND_POI(2246.68, 241.89, 7, 6, 0, "Nurse Neela");
+            pPlayer->SEND_GOSSIP_MENU(4087,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Fishing
-            player->SEND_POI(2292.37, -10.72, 7, 6, 0, "Clyde Kellen");
-            player->SEND_GOSSIP_MENU(4088,_Creature->GetGUID());
+            pPlayer->SEND_POI(2292.37, -10.72, 7, 6, 0, "Clyde Kellen");
+            pPlayer->SEND_GOSSIP_MENU(4088,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Herbalism
-            player->SEND_POI(2268.21, 331.69, 7, 6, 0, "Faruza");
-            player->SEND_GOSSIP_MENU(4089,_Creature->GetGUID());
+            pPlayer->SEND_POI(2268.21, 331.69, 7, 6, 0, "Faruza");
+            pPlayer->SEND_GOSSIP_MENU(4089,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Leatherworking
-            player->SEND_POI(2027, 78.72, 7, 6, 0, "Shelene Rhobart");
-            player->SEND_GOSSIP_MENU(4090,_Creature->GetGUID());
+            pPlayer->SEND_POI(2027, 78.72, 7, 6, 0, "Shelene Rhobart");
+            pPlayer->SEND_GOSSIP_MENU(4090,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Mining
-            player->SEND_GOSSIP_MENU(4091,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(4091,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Skinning
-            player->SEND_POI(2027, 78.72, 7, 6, 0, "Rand Rhobart");
-            player->SEND_GOSSIP_MENU(4092,_Creature->GetGUID());
+            pPlayer->SEND_POI(2027, 78.72, 7, 6, 0, "Rand Rhobart");
+            pPlayer->SEND_GOSSIP_MENU(4092,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Tailoring
-            player->SEND_POI(2160.45, 659.93, 7, 6, 0, "Bowen Brisboise");
-            player->SEND_GOSSIP_MENU(4093,_Creature->GetGUID());
+            pPlayer->SEND_POI(2160.45, 659.93, 7, 6, 0, "Bowen Brisboise");
+            pPlayer->SEND_GOSSIP_MENU(4093,_Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_tirisfal(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_tirisfal(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_tirisfal(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_tirisfal(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_tirisfal(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_tirisfal(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_tirisfal(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_tirisfal(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -3683,205 +3683,205 @@ CreatureAI* GetAI_guard_tirisfal(Creature *_Creature)
  * guard_undercity start
  *******************************************************/
 
-bool GossipHello_guard_undercity(Player *player, Creature *_Creature)
-{
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATHANDLER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ZEPPLINMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
-    player->SEND_GOSSIP_MENU(3543,_Creature->GetGUID());
+bool GossipHello_guard_undercity(Player* pPlayer, Creature *_Creature)
+{
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BANK          , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATHANDLER    , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_GUILDMASTER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_INN           , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAILBOX       , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AUCTIONHOUSE  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ZEPPLINMASTER , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WEAPONMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_STABLEMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BATTLEMASTER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_CLASSTRAINER  , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PROFTRAINER   , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
+    pPlayer->SEND_GOSSIP_MENU(3543,_Creature->GetGUID());
     return true;
 }
 
-void SendDefaultMenu_guard_undercity(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_guard_undercity(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Bank
-            player->SEND_POI(1595.64, 232.45, 7, 6, 0, "Undercity Bank");
-            player->SEND_GOSSIP_MENU(3514,_Creature->GetGUID());
+            pPlayer->SEND_POI(1595.64, 232.45, 7, 6, 0, "Undercity Bank");
+            pPlayer->SEND_GOSSIP_MENU(3514,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Bat handler
-            player->SEND_POI(1565.9, 271.43, 7, 6, 0, "Undercity Bat Handler");
-            player->SEND_GOSSIP_MENU(3515,_Creature->GetGUID());
+            pPlayer->SEND_POI(1565.9, 271.43, 7, 6, 0, "Undercity Bat Handler");
+            pPlayer->SEND_GOSSIP_MENU(3515,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Guild master
-            player->SEND_POI(1594.17, 205.57, 7, 6, 0, "Undercity Guild Master");
-            player->SEND_GOSSIP_MENU(3516,_Creature->GetGUID());
+            pPlayer->SEND_POI(1594.17, 205.57, 7, 6, 0, "Undercity Guild Master");
+            pPlayer->SEND_GOSSIP_MENU(3516,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Inn
-            player->SEND_POI(1639.43, 220.99, 7, 6, 0, "Undercity Inn");
-            player->SEND_GOSSIP_MENU(3517,_Creature->GetGUID());
+            pPlayer->SEND_POI(1639.43, 220.99, 7, 6, 0, "Undercity Inn");
+            pPlayer->SEND_GOSSIP_MENU(3517,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Mailbox
-            player->SEND_POI(1632.68, 219.4, 7, 6, 0, "Undercity Mailbox");
-            player->SEND_GOSSIP_MENU(3518,_Creature->GetGUID());
+            pPlayer->SEND_POI(1632.68, 219.4, 7, 6, 0, "Undercity Mailbox");
+            pPlayer->SEND_GOSSIP_MENU(3518,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //Auction House
-            player->SEND_POI(1647.9, 258.49, 7, 6, 0, "Undercity Auction House");
-            player->SEND_GOSSIP_MENU(3519,_Creature->GetGUID());
+            pPlayer->SEND_POI(1647.9, 258.49, 7, 6, 0, "Undercity Auction House");
+            pPlayer->SEND_GOSSIP_MENU(3519,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Zeppelin
-            player->SEND_POI(2059, 274.86, 7, 6, 0, "Undercity Zeppelin");
-            player->SEND_GOSSIP_MENU(3520,_Creature->GetGUID());
+            pPlayer->SEND_POI(2059, 274.86, 7, 6, 0, "Undercity Zeppelin");
+            pPlayer->SEND_GOSSIP_MENU(3520,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Weapon Master
-            player->SEND_POI(1670.31, 324.66, 7, 6, 0, "Archibald");
-            player->SEND_GOSSIP_MENU(4521,_Creature->GetGUID());
+            pPlayer->SEND_POI(1670.31, 324.66, 7, 6, 0, "Archibald");
+            pPlayer->SEND_GOSSIP_MENU(4521,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Stable master
-            player->SEND_POI(1634.18, 226.76, 7, 6, 0, "Anya Maulray");
-            player->SEND_GOSSIP_MENU(5979,_Creature->GetGUID());
+            pPlayer->SEND_POI(1634.18, 226.76, 7, 6, 0, "Anya Maulray");
+            pPlayer->SEND_GOSSIP_MENU(5979,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Battlemaster
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY   , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(7527,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALTERACVALLEY   , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ARATHIBASIN     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARSONGULCH     , GOSSIP_SENDER_SEC_BATTLEINFO, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(7527,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Class trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE            , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE           , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->SEND_GOSSIP_MENU(3542,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MAGE            , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_PRIEST          , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ROGUE           , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARLOCK         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_WARRIOR         , GOSSIP_SENDER_SEC_CLASSTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(3542,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Profession trainer
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING   , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING     , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING  , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->SEND_GOSSIP_MENU(3541,_Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ALCHEMY         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_BLACKSMITHING   , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_COOKING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENCHANTING      , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_ENGINEERING     , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FIRSTAID        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_FISHING         , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_HERBALISM       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_LEATHERWORKING  , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_MINING          , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_SKINNING        , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_TAILORING       , GOSSIP_SENDER_SEC_PROFTRAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->SEND_GOSSIP_MENU(3541,_Creature->GetGUID());
             break;
     }
 }
 
-void SendBattleMasterMenu_guard_undercity(Player *player, Creature *_Creature, uint32 action)
+void SendBattleMasterMenu_guard_undercity(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //AV
-            player->SEND_POI(1329, 333.92, 7, 6, 0, "Grizzle Halfmane");
-            player->SEND_GOSSIP_MENU(7525,_Creature->GetGUID());
+            pPlayer->SEND_POI(1329, 333.92, 7, 6, 0, "Grizzle Halfmane");
+            pPlayer->SEND_GOSSIP_MENU(7525,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //AB
-            player->SEND_POI(1283.3, 287.16, 7, 6, 0, "Sir Malory Wheeler");
-            player->SEND_GOSSIP_MENU(7646,_Creature->GetGUID());
+            pPlayer->SEND_POI(1283.3, 287.16, 7, 6, 0, "Sir Malory Wheeler");
+            pPlayer->SEND_GOSSIP_MENU(7646,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //WSG
-            player->SEND_POI(1265, 351.18, 7, 6, 0, "Kurden Bloodclaw");
-            player->SEND_GOSSIP_MENU(7526,_Creature->GetGUID());
+            pPlayer->SEND_POI(1265, 351.18, 7, 6, 0, "Kurden Bloodclaw");
+            pPlayer->SEND_GOSSIP_MENU(7526,_Creature->GetGUID());
             break;
     }
 }
 
-void SendClassTrainerMenu_guard_undercity(Player *player, Creature *_Creature, uint32 action)
+void SendClassTrainerMenu_guard_undercity(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Mage
-            player->SEND_POI(1781, 53, 7, 6, 0, "Undercity Mage Trainers");
-            player->SEND_GOSSIP_MENU(3513,_Creature->GetGUID());
+            pPlayer->SEND_POI(1781, 53, 7, 6, 0, "Undercity Mage Trainers");
+            pPlayer->SEND_GOSSIP_MENU(3513,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Priest
-            player->SEND_POI(1758.33, 401.5, 7, 6, 0, "Undercity Priest Trainers");
-            player->SEND_GOSSIP_MENU(3521,_Creature->GetGUID());
+            pPlayer->SEND_POI(1758.33, 401.5, 7, 6, 0, "Undercity Priest Trainers");
+            pPlayer->SEND_GOSSIP_MENU(3521,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Rogue
-            player->SEND_POI(1418.56, 65, 7, 6, 0, "Undercity Rogue Trainers");
-            player->SEND_GOSSIP_MENU(3524,_Creature->GetGUID());
+            pPlayer->SEND_POI(1418.56, 65, 7, 6, 0, "Undercity Rogue Trainers");
+            pPlayer->SEND_GOSSIP_MENU(3524,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Warlock
-            player->SEND_POI(1780.92, 53.16, 7, 6, 0, "Undercity Warlock Trainers");
-            player->SEND_GOSSIP_MENU(3526,_Creature->GetGUID());
+            pPlayer->SEND_POI(1780.92, 53.16, 7, 6, 0, "Undercity Warlock Trainers");
+            pPlayer->SEND_GOSSIP_MENU(3526,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Warrior
-            player->SEND_POI(1775.59, 418.19, 7, 6, 0, "Undercity Warrior Trainers");
-            player->SEND_GOSSIP_MENU(3527,_Creature->GetGUID());
+            pPlayer->SEND_POI(1775.59, 418.19, 7, 6, 0, "Undercity Warrior Trainers");
+            pPlayer->SEND_GOSSIP_MENU(3527,_Creature->GetGUID());
             break;
     }
 }
 
-void SendProfTrainerMenu_guard_undercity(Player *player, Creature *_Creature, uint32 action)
+void SendProfTrainerMenu_guard_undercity(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:                    //Alchemy
-            player->SEND_POI(1419.82, 417.19, 7, 6, 0, "The Apothecarium");
-            player->SEND_GOSSIP_MENU(3528,_Creature->GetGUID());
+            pPlayer->SEND_POI(1419.82, 417.19, 7, 6, 0, "The Apothecarium");
+            pPlayer->SEND_GOSSIP_MENU(3528,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:                    //Blacksmithing
-            player->SEND_POI(1696, 285, 7, 6, 0, "Undercity Blacksmithing Trainer");
-            player->SEND_GOSSIP_MENU(3529,_Creature->GetGUID());
+            pPlayer->SEND_POI(1696, 285, 7, 6, 0, "Undercity Blacksmithing Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3529,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:                    //Cooking
-            player->SEND_POI(1596.34, 274.68, 7, 6, 0, "Undercity Cooking Trainer");
-            player->SEND_GOSSIP_MENU(3530,_Creature->GetGUID());
+            pPlayer->SEND_POI(1596.34, 274.68, 7, 6, 0, "Undercity Cooking Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3530,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:                    //Enchanting
-            player->SEND_POI(1488.54, 280.19, 7, 6, 0, "Undercity Enchanting Trainer");
-            player->SEND_GOSSIP_MENU(3531,_Creature->GetGUID());
+            pPlayer->SEND_POI(1488.54, 280.19, 7, 6, 0, "Undercity Enchanting Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3531,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:                    //Engineering
-            player->SEND_POI(1408.58, 143.43, 7, 6, 0, "Undercity Engineering Trainer");
-            player->SEND_GOSSIP_MENU(3532,_Creature->GetGUID());
+            pPlayer->SEND_POI(1408.58, 143.43, 7, 6, 0, "Undercity Engineering Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3532,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:                    //First Aid
-            player->SEND_POI(1519.65, 167.19, 7, 6, 0, "Undercity First Aid Trainer");
-            player->SEND_GOSSIP_MENU(3533,_Creature->GetGUID());
+            pPlayer->SEND_POI(1519.65, 167.19, 7, 6, 0, "Undercity First Aid Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3533,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:                    //Fishing
-            player->SEND_POI(1679.9, 89, 7, 6, 0, "Undercity Fishing Trainer");
-            player->SEND_GOSSIP_MENU(3534,_Creature->GetGUID());
+            pPlayer->SEND_POI(1679.9, 89, 7, 6, 0, "Undercity Fishing Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3534,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:                    //Herbalism
-            player->SEND_POI(1558, 349.36, 7, 6, 0, "Undercity Herbalism Trainer");
-            player->SEND_GOSSIP_MENU(3535,_Creature->GetGUID());
+            pPlayer->SEND_POI(1558, 349.36, 7, 6, 0, "Undercity Herbalism Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3535,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:                    //Leatherworking
-            player->SEND_POI(1498.76, 196.43, 7, 6, 0, "Undercity Leatherworking Trainer");
-            player->SEND_GOSSIP_MENU(3536,_Creature->GetGUID());
+            pPlayer->SEND_POI(1498.76, 196.43, 7, 6, 0, "Undercity Leatherworking Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3536,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:                   //Mining
-            player->SEND_POI(1642.88, 335.58, 7, 6, 0, "Undercity Mining Trainer");
-            player->SEND_GOSSIP_MENU(3537,_Creature->GetGUID());
+            pPlayer->SEND_POI(1642.88, 335.58, 7, 6, 0, "Undercity Mining Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3537,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:                   //Skinning
-            player->SEND_POI(1498.6, 196.46, 7, 6, 0, "Undercity Skinning Trainer");
-            player->SEND_GOSSIP_MENU(3538,_Creature->GetGUID());
+            pPlayer->SEND_POI(1498.6, 196.46, 7, 6, 0, "Undercity Skinning Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3538,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:                   //Tailoring
-            player->SEND_POI(1689.55, 193, 7, 6, 0, "Undercity Tailoring Trainer");
-            player->SEND_GOSSIP_MENU(3539,_Creature->GetGUID());
+            pPlayer->SEND_POI(1689.55, 193, 7, 6, 0, "Undercity Tailoring Trainer");
+            pPlayer->SEND_GOSSIP_MENU(3539,_Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_guard_undercity(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_guard_undercity(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (sender)
     {
-        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_undercity(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_undercity(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_undercity(player, _Creature, action); break;
-        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_undercity(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:            SendDefaultMenu_guard_undercity(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_CLASSTRAIN:  SendClassTrainerMenu_guard_undercity(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_PROFTRAIN:   SendProfTrainerMenu_guard_undercity(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_SEC_BATTLEINFO:  SendBattleMasterMenu_guard_undercity(pPlayer, _Creature, action); break;
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/item/item_scripts.cpp b/src/bindings/scripts/scripts/item/item_scripts.cpp
index 10c3069e1dc..f103dc86cdc 100644
--- a/src/bindings/scripts/scripts/item/item_scripts.cpp
+++ b/src/bindings/scripts/scripts/item/item_scripts.cpp
@@ -41,7 +41,7 @@ enum
     SPELL_ARCANE_CHARGES    = 45072
 };
 
-bool ItemUse_item_only_for_flight(Player *player, Item* _Item, SpellCastTargets const& targets)
+bool ItemUse_item_only_for_flight(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
 {
     uint32 itemId = _Item->GetEntry();
     bool disabled = false;
@@ -50,25 +50,25 @@ bool ItemUse_item_only_for_flight(Player *player, Item* _Item, SpellCastTargets
     switch(itemId)
     {
        case 24538:
-            if(player->GetAreaId() != 3628)
+            if (pPlayer->GetAreaId() != 3628)
                 disabled = true;
                 break;
        case 34489:
-            if(player->GetZoneId() != 4080)
+            if (pPlayer->GetZoneId() != 4080)
                 disabled = true;
                 break;
        case 34475:
             if (const SpellEntry* pSpellInfo = GetSpellStore()->LookupEntry(SPELL_ARCANE_CHARGES))
-                Spell::SendCastResult(player, pSpellInfo, 1, SPELL_FAILED_NOT_ON_GROUND);
+                Spell::SendCastResult(pPlayer, pSpellInfo, 1, SPELL_FAILED_NOT_ON_GROUND);
                 break;
     }
 
     // allow use in flight only
-    if( player->isInFlight() && !disabled)
+    if (pPlayer->isInFlight() && !disabled)
         return false;
 
     // error
-    player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,_Item,NULL);
+    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,_Item,NULL);
     return true;
 }
 
@@ -78,30 +78,30 @@ bool ItemUse_item_only_for_flight(Player *player, Item* _Item, SpellCastTargets
 
 //This is just a hack and should be removed from here.
 //Creature/Item are in fact created before spell are sucessfully casted, without any checks at all to ensure proper/expected behavior.
-bool ItemUse_item_draenei_fishing_net(Player *player, Item* _Item, SpellCastTargets const& targets)
+bool ItemUse_item_draenei_fishing_net(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
 {
-    //if( targets.getGOTarget() && targets.getGOTarget()->GetTypeId() == TYPEID_GAMEOBJECT &&
-    //targets.getGOTarget()->GetGOInfo()->type == GAMEOBJECT_TYPE_SPELL_FOCUS && targets.getGOTarget()->GetEntry() == 181616 )
+    //if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId() == TYPEID_GAMEOBJECT &&
+    //targets.getGOTarget()->GetGOInfo()->type == GAMEOBJECT_TYPE_SPELL_FOCUS && targets.getGOTarget()->GetEntry() == 181616)
     //{
-    if( player->GetQuestStatus(9452) == QUEST_STATUS_INCOMPLETE )
+    if (pPlayer->GetQuestStatus(9452) == QUEST_STATUS_INCOMPLETE)
     {
-        if( rand()%100 < 35 )
+        if (rand()%100 < 35)
         {
-            Creature *Murloc = player->SummonCreature(17102,player->GetPositionX() ,player->GetPositionY()+20, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-            if( Murloc )
-                Murloc->AI()->AttackStart(player);
+            Creature *Murloc = pPlayer->SummonCreature(17102,pPlayer->GetPositionX() ,pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
+            if (Murloc)
+                Murloc->AI()->AttackStart(pPlayer);
         }
         else
         {
             ItemPosCountVec dest;
-            uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 23614, 1);
-            if( msg == EQUIP_ERR_OK )
+            uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 23614, 1);
+            if (msg == EQUIP_ERR_OK)
             {
-                Item* item = player->StoreNewItem(dest,23614,true);
-                if( item )
-                    player->SendNewItem(item,1,false,true);
+                Item* item = pPlayer->StoreNewItem(dest,23614,true);
+                if (item)
+                    pPlayer->SendNewItem(item,1,false,true);
             }else
-            player->SendEquipError(msg,NULL,NULL);
+            pPlayer->SendEquipError(msg,NULL,NULL);
         }
     }
     //}
@@ -112,15 +112,15 @@ bool ItemUse_item_draenei_fishing_net(Player *player, Item* _Item, SpellCastTarg
 # item_nether_wraith_beacon
 #####*/
 
-bool ItemUse_item_nether_wraith_beacon(Player *player, Item* _Item, SpellCastTargets const& targets)
+bool ItemUse_item_nether_wraith_beacon(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
 {
-    if (player->GetQuestStatus(10832) == QUEST_STATUS_INCOMPLETE)
+    if (pPlayer->GetQuestStatus(10832) == QUEST_STATUS_INCOMPLETE)
     {
         Creature *Nether;
-        Nether = player->SummonCreature(22408,player->GetPositionX() ,player->GetPositionY()+20, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000);
-        Nether = player->SummonCreature(22408,player->GetPositionX() ,player->GetPositionY()-20, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000);
+        Nether = pPlayer->SummonCreature(22408,pPlayer->GetPositionX() ,pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000);
+        Nether = pPlayer->SummonCreature(22408,pPlayer->GetPositionX() ,pPlayer->GetPositionY()-20, pPlayer->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000);
         if (Nether)
-            (Nether->AI())->AttackStart(player);
+            (Nether->AI())->AttackStart(pPlayer);
     }
     return false;
 }
@@ -129,19 +129,19 @@ bool ItemUse_item_nether_wraith_beacon(Player *player, Item* _Item, SpellCastTar
 # item_flying_machine
 #####*/
 
-bool ItemUse_item_flying_machine(Player *player, Item* _Item, SpellCastTargets const& targets)
+bool ItemUse_item_flying_machine(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
 {
     uint32 itemId = _Item->GetEntry();
-    if( itemId == 34060 )
-        if( player->GetBaseSkillValue(SKILL_RIDING) >= 225 )
+    if (itemId == 34060)
+        if (pPlayer->GetBaseSkillValue(SKILL_RIDING) >= 225)
             return false;
 
-    if( itemId == 34061 )
-        if( player->GetBaseSkillValue(SKILL_RIDING) == 300 )
+    if (itemId == 34061)
+        if (pPlayer->GetBaseSkillValue(SKILL_RIDING) == 300)
             return false;
 
     debug_log("TSCR: Player attempt to use item %u, but did not meet riding requirement",itemId);
-    player->SendEquipError(EQUIP_ERR_ERR_CANT_EQUIP_SKILL,_Item,NULL);
+    pPlayer->SendEquipError(EQUIP_ERR_ERR_CANT_EQUIP_SKILL,_Item,NULL);
     return true;
 }
 
@@ -149,13 +149,13 @@ bool ItemUse_item_flying_machine(Player *player, Item* _Item, SpellCastTargets c
 # item_gor_dreks_ointment
 #####*/
 
-bool ItemUse_item_gor_dreks_ointment(Player *player, Item* _Item, SpellCastTargets const& targets)
+bool ItemUse_item_gor_dreks_ointment(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
 {
-    if( targets.getUnitTarget() && targets.getUnitTarget()->GetTypeId()==TYPEID_UNIT &&
-        targets.getUnitTarget()->GetEntry() == 20748 && !targets.getUnitTarget()->HasAura(32578) )
+    if (targets.getUnitTarget() && targets.getUnitTarget()->GetTypeId()==TYPEID_UNIT &&
+        targets.getUnitTarget()->GetEntry() == 20748 && !targets.getUnitTarget()->HasAura(32578))
         return false;
 
-    player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,_Item,NULL);
+    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,_Item,NULL);
     return true;
 }
 
@@ -163,15 +163,15 @@ bool ItemUse_item_gor_dreks_ointment(Player *player, Item* _Item, SpellCastTarge
 # item_incendiary_explosives
 #####*/
 
-bool ItemUse_item_incendiary_explosives(Player *player, Item* _Item, SpellCastTargets const& targets)
+bool ItemUse_item_incendiary_explosives(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
 {
-    if ( player->FindNearestCreature(26248,15) || player->FindNearestCreature(26249,15) )
+    if (pPlayer->FindNearestCreature(26248,15) || pPlayer->FindNearestCreature(26249,15))
     {
         return false;
     }
     else
     {
-        player->SendEquipError(EQUIP_ERR_OUT_OF_RANGE,_Item,NULL);
+        pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE,_Item,NULL);
         return true;
     }
 }
@@ -180,13 +180,13 @@ bool ItemUse_item_incendiary_explosives(Player *player, Item* _Item, SpellCastTa
 # item_mysterious_egg
 #####*/
 
-bool ItemExpire_item_mysterious_egg(Player *player, ItemPrototype const * _ItemProto)
+bool ItemExpire_item_mysterious_egg(Player* pPlayer, ItemPrototype const * _ItemProto)
 {
     ItemPosCountVec dest;
-    uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg
-    if( msg == EQUIP_ERR_OK )
+    uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg
+    if (msg == EQUIP_ERR_OK)
     {
-        player->StoreNewItem( dest, 39883, true, Item::GenerateItemRandomPropertyId(39883));
+        pPlayer->StoreNewItem(dest, 39883, true, Item::GenerateItemRandomPropertyId(39883));
     }
     return true;
 }
@@ -195,13 +195,13 @@ bool ItemExpire_item_mysterious_egg(Player *player, ItemPrototype const * _ItemP
 # item_disgusting_jar
 #####*/
 
-bool ItemExpire_item_disgusting_jar(Player *player, ItemPrototype const * _ItemProto)
+bool ItemExpire_item_disgusting_jar(Player* pPlayer, ItemPrototype const * _ItemProto)
 {
     ItemPosCountVec dest;
-    uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar
-    if( msg == EQUIP_ERR_OK )
+    uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar
+    if (msg == EQUIP_ERR_OK)
     {
-        player->StoreNewItem( dest, 44718, true, Item::GenerateItemRandomPropertyId(44718));
+        pPlayer->StoreNewItem(dest, 44718, true, Item::GenerateItemRandomPropertyId(44718));
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/item/item_test.cpp b/src/bindings/scripts/scripts/item/item_test.cpp
index 4fc8ea221db..0c2d9ac2793 100644
--- a/src/bindings/scripts/scripts/item/item_test.cpp
+++ b/src/bindings/scripts/scripts/item/item_test.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 
 extern void LoadDatabase();
 
-bool ItemUse_item_test(Player *player, Item* _Item, SpellCastTargets const& targets)
+bool ItemUse_item_test(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
 {
     LoadDatabase();
     return true;
diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp
index 61bdaf0c35b..48991193e51 100644
--- a/src/bindings/scripts/scripts/npc/npc_escortAI.cpp
+++ b/src/bindings/scripts/scripts/npc/npc_escortAI.cpp
@@ -25,7 +25,7 @@ void npc_escortAI::AttackStart(Unit *who)
     if (!who)
         return;
 
-    if(m_creature->Attack(who, true) )
+    if (m_creature->Attack(who, true))
     {
         if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE)
             m_creature->GetMotionMaster()->MovementExpired();
@@ -92,7 +92,7 @@ void npc_escortAI::UpdateAI(const uint32 diff)
             //End of the line
             if (CurrentWP == WaypointList.end())
             {
-                if(DespawnAtEnd)
+                if (DespawnAtEnd)
                 {
                     debug_log("TSCR: EscortAI reached end of waypoints");
 
@@ -127,9 +127,9 @@ void npc_escortAI::UpdateAI(const uint32 diff)
                 }
             }
 
-            if( !IsOnHold )
+            if (!IsOnHold)
             {
-                m_creature->GetMotionMaster()->MovePoint(CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z );
+                m_creature->GetMotionMaster()->MovePoint(CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z);
                 debug_log("TSCR: EscortAI Next WP is: %u, %f, %f, %f", CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z);
                 m_uiWPWaitTimer = 0;
             }
@@ -186,7 +186,7 @@ void npc_escortAI::UpdateAI(const uint32 diff)
         }else m_uiPlayerCheckTimer -= diff;
     }
 
-    if(CanMelee && UpdateVictim())
+    if (CanMelee && UpdateVictim())
         DoMeleeAttackIfReady();
 }
 
@@ -332,7 +332,7 @@ void npc_escortAI::Start(bool bIsActiveAttacker, bool bRun, uint64 uiPlayerGUID,
     if (m_bCanReturnToStart && m_bCanInstantRespawn)
         debug_log("TSCR: EscortAI is set to return home after waypoint end and instant respawn at waypoint end. Creature will never despawn.");
 
-    if(m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
+    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
     {
         m_creature->GetMotionMaster()->MovementExpired();
         m_creature->GetMotionMaster()->MoveIdle();
@@ -353,7 +353,7 @@ void npc_escortAI::Start(bool bIsActiveAttacker, bool bRun, uint64 uiPlayerGUID,
         m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
 
     //Start WP
-    m_creature->GetMotionMaster()->MovePoint(CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z );
+    m_creature->GetMotionMaster()->MovePoint(CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z);
     debug_log("TSCR: EscortAI Next WP is: %d, %f, %f, %f", CurrentWP->id, CurrentWP->x, CurrentWP->y, CurrentWP->z);
     IsBeingEscorted = true;
 }
diff --git a/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp b/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp
index 4332339a57e..3cba528673e 100644
--- a/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp
+++ b/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp
@@ -47,15 +47,15 @@ bool isEventActive()
     return false;
 }
 
-bool GossipHello_npc_innkeeper(Player *player, Creature *_Creature)
+bool GossipHello_npc_innkeeper(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (isEventActive()&& !player->GetAura(SPELL_TRICK_OR_TREATED, player->GetGUID()))
+    if (isEventActive()&& !pPlayer->GetAura(SPELL_TRICK_OR_TREATED, pPlayer->GetGUID()))
     {
         char* localizedEntry;
-        switch (player->GetSession()->GetSessionDbLocaleIndex())
+        switch (pPlayer->GetSession()->GetSessionDbLocaleIndex())
         {
             case 0:
                 localizedEntry=LOCALE_TRICK_OR_TREAT_0;
@@ -73,25 +73,25 @@ bool GossipHello_npc_innkeeper(Player *player, Creature *_Creature)
                 localizedEntry=LOCALE_TRICK_OR_TREAT_0;
         }
 
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID);
     }
 
-    player->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID());
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_innkeeper(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_innkeeper(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if (action == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && isEventActive() && !player->GetAura(SPELL_TRICK_OR_TREATED, player->GetGUID()))
+    if (action == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && isEventActive() && !pPlayer->GetAura(SPELL_TRICK_OR_TREATED, pPlayer->GetGUID()))
     {
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player, SPELL_TRICK_OR_TREATED, true);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer, SPELL_TRICK_OR_TREATED, true);
 
         // either trick or treat, 50% chance
-        if(rand()%2)
+        if (rand()%2)
         {
-            player->CastSpell(player, SPELL_TREAT, true);
+            pPlayer->CastSpell(pPlayer, SPELL_TREAT, true);
         }
         else
         {
@@ -126,7 +126,7 @@ bool GossipSelect_npc_innkeeper(Player *player, Creature *_Creature, uint32 send
                     trickspell=24723;                       // skeleton costume
                     break;
             }
-            player->CastSpell(player, trickspell, true);
+            pPlayer->CastSpell(pPlayer, trickspell, true);
         }
         return true;                                        // prevent Trinity core handling
     }
diff --git a/src/bindings/scripts/scripts/npc/npc_professions.cpp b/src/bindings/scripts/scripts/npc/npc_professions.cpp
index cc6859cb4be..30da0ff3963 100644
--- a/src/bindings/scripts/scripts/npc/npc_professions.cpp
+++ b/src/bindings/scripts/scripts/npc/npc_professions.cpp
@@ -183,20 +183,20 @@ there is no difference here (except that default text is chosen with `gameobject
 # formulas to calculate unlearning cost
 ###*/
 
-int32 DoLearnCost(Player *player)                           //tailor, alchemy
+int32 DoLearnCost(Player* pPlayer)                           //tailor, alchemy
 {
     return 200000;
 }
 
-int32 DoHighUnlearnCost(Player *player)                     //tailor, alchemy
+int32 DoHighUnlearnCost(Player* pPlayer)                     //tailor, alchemy
 {
     return 1500000;
 }
 
-int32 DoMedUnlearnCost(Player *player)                      //blacksmith, leatherwork
+int32 DoMedUnlearnCost(Player* pPlayer)                      //blacksmith, leatherwork
 {
-    uint32 level = player->getLevel();
-    if(level < 51)
+    uint32 level = pPlayer->getLevel();
+    if (level < 51)
         return 250000;
     else if (level < 66)
         return 500000;
@@ -204,9 +204,9 @@ int32 DoMedUnlearnCost(Player *player)                      //blacksmith, leathe
         return 1000000;
 }
 
-int32 DoLowUnlearnCost(Player *player)                      //blacksmith
+int32 DoLowUnlearnCost(Player* pPlayer)                      //blacksmith
 {
-    uint32 level = player->getLevel();
+    uint32 level = pPlayer->getLevel();
     if (level < 66)
         return 50000;
     else
@@ -217,25 +217,25 @@ int32 DoLowUnlearnCost(Player *player)                      //blacksmith
 # unlearning related profession spells
 ###*/
 
-bool EquippedOk(Player* player, uint32 spellId)
+bool EquippedOk(Player* pPlayer, uint32 spellId)
 {
     SpellEntry const* spell = GetSpellStore()->LookupEntry(spellId);
 
-    if( !spell )
+    if (!spell)
         return false;
 
     for(uint8 i=0; i<3; ++i)
     {
         uint32 reqSpell = spell->EffectTriggerSpell[i];
-        if( !reqSpell )
+        if (!reqSpell)
             continue;
 
         Item* pItem;
         for(uint8 j = EQUIPMENT_SLOT_START; j < EQUIPMENT_SLOT_END; j++)
         {
-            pItem = player->GetItemByPos( INVENTORY_SLOT_BAG_0, j );
-            if( pItem )
-                if( pItem->GetProto()->RequiredSpell == reqSpell )
+            pItem = pPlayer->GetItemByPos(INVENTORY_SLOT_BAG_0, j);
+            if (pItem)
+                if (pItem->GetProto()->RequiredSpell == reqSpell)
             {
                 //player has item equipped that require specialty. Not allow to unlearn, player has to unequip first
                 debug_log("TSCR: player attempt to unlearn spell %u, but item %u is equipped.",reqSpell,pItem->GetProto()->ItemId);
@@ -246,95 +246,95 @@ bool EquippedOk(Player* player, uint32 spellId)
     return true;
 }
 
-void ProfessionUnlearnSpells(Player *player, uint32 type)
+void ProfessionUnlearnSpells(Player* pPlayer, uint32 type)
 {
     switch (type)
     {
         case 36436:                                         // S_UNLEARN_WEAPON
-            player->removeSpell(36125);                     // Light Earthforged Blade
-            player->removeSpell(36128);                     // Light Emberforged Hammer
-            player->removeSpell(36126);                     // Light Skyforged Axe
+            pPlayer->removeSpell(36125);                     // Light Earthforged Blade
+            pPlayer->removeSpell(36128);                     // Light Emberforged Hammer
+            pPlayer->removeSpell(36126);                     // Light Skyforged Axe
             break;
         case 36435:                                         // S_UNLEARN_ARMOR
-            player->removeSpell(36122);                     // Earthforged Leggings
-            player->removeSpell(36129);                     // Heavy Earthforged Breastplate
-            player->removeSpell(36130);                     // Stormforged Hauberk
-            player->removeSpell(34533);                     // Breastplate of Kings
-            player->removeSpell(34529);                     // Nether Chain Shirt
-            player->removeSpell(34534);                     // Bulwark of Kings
-            player->removeSpell(36257);                     // Bulwark of the Ancient Kings
-            player->removeSpell(36256);                     // Embrace of the Twisting Nether
-            player->removeSpell(34530);                     // Twisting Nether Chain Shirt
-            player->removeSpell(36124);                     // Windforged Leggings
+            pPlayer->removeSpell(36122);                     // Earthforged Leggings
+            pPlayer->removeSpell(36129);                     // Heavy Earthforged Breastplate
+            pPlayer->removeSpell(36130);                     // Stormforged Hauberk
+            pPlayer->removeSpell(34533);                     // Breastplate of Kings
+            pPlayer->removeSpell(34529);                     // Nether Chain Shirt
+            pPlayer->removeSpell(34534);                     // Bulwark of Kings
+            pPlayer->removeSpell(36257);                     // Bulwark of the Ancient Kings
+            pPlayer->removeSpell(36256);                     // Embrace of the Twisting Nether
+            pPlayer->removeSpell(34530);                     // Twisting Nether Chain Shirt
+            pPlayer->removeSpell(36124);                     // Windforged Leggings
             break;
         case 36441:                                         // S_UNLEARN_HAMMER
-            player->removeSpell(36262);                     // Dragonstrike
-            player->removeSpell(34546);                     // Dragonmaw
-            player->removeSpell(34545);                     // Drakefist Hammer
-            player->removeSpell(36136);                     // Lavaforged Warhammer
-            player->removeSpell(34547);                     // Thunder
-            player->removeSpell(34567);                     // Deep Thunder
-            player->removeSpell(36263);                     // Stormherald
-            player->removeSpell(36137);                     // Great Earthforged Hammer
+            pPlayer->removeSpell(36262);                     // Dragonstrike
+            pPlayer->removeSpell(34546);                     // Dragonmaw
+            pPlayer->removeSpell(34545);                     // Drakefist Hammer
+            pPlayer->removeSpell(36136);                     // Lavaforged Warhammer
+            pPlayer->removeSpell(34547);                     // Thunder
+            pPlayer->removeSpell(34567);                     // Deep Thunder
+            pPlayer->removeSpell(36263);                     // Stormherald
+            pPlayer->removeSpell(36137);                     // Great Earthforged Hammer
             break;
         case 36439:                                         // S_UNLEARN_AXE
-            player->removeSpell(36260);                     // Wicked Edge of the Planes
-            player->removeSpell(34562);                     // Black Planar Edge
-            player->removeSpell(34541);                     // The Planar Edge
-            player->removeSpell(36134);                     // Stormforged Axe
-            player->removeSpell(36135);                     // Skyforged Great Axe
-            player->removeSpell(36261);                     // Bloodmoon
-            player->removeSpell(34543);                     // Lunar Crescent
-            player->removeSpell(34544);                     // Mooncleaver
+            pPlayer->removeSpell(36260);                     // Wicked Edge of the Planes
+            pPlayer->removeSpell(34562);                     // Black Planar Edge
+            pPlayer->removeSpell(34541);                     // The Planar Edge
+            pPlayer->removeSpell(36134);                     // Stormforged Axe
+            pPlayer->removeSpell(36135);                     // Skyforged Great Axe
+            pPlayer->removeSpell(36261);                     // Bloodmoon
+            pPlayer->removeSpell(34543);                     // Lunar Crescent
+            pPlayer->removeSpell(34544);                     // Mooncleaver
             break;
         case 36438:                                         // S_UNLEARN_SWORD
-            player->removeSpell(36258);                     // Blazefury
-            player->removeSpell(34537);                     // Blazeguard
-            player->removeSpell(34535);                     // Fireguard
-            player->removeSpell(36131);                     // Windforged Rapier
-            player->removeSpell(36133);                     // Stoneforged Claymore
-            player->removeSpell(34538);                     // Lionheart Blade
-            player->removeSpell(34540);                     // Lionheart Champion
-            player->removeSpell(36259);                     // Lionheart Executioner
+            pPlayer->removeSpell(36258);                     // Blazefury
+            pPlayer->removeSpell(34537);                     // Blazeguard
+            pPlayer->removeSpell(34535);                     // Fireguard
+            pPlayer->removeSpell(36131);                     // Windforged Rapier
+            pPlayer->removeSpell(36133);                     // Stoneforged Claymore
+            pPlayer->removeSpell(34538);                     // Lionheart Blade
+            pPlayer->removeSpell(34540);                     // Lionheart Champion
+            pPlayer->removeSpell(36259);                     // Lionheart Executioner
             break;
         case 36434:                                         // S_UNLEARN_DRAGON
-            player->removeSpell(36076);                     // Dragonstrike Leggings
-            player->removeSpell(36079);                     // Golden Dragonstrike Breastplate
-            player->removeSpell(35576);                     // Ebon Netherscale Belt
-            player->removeSpell(35577);                     // Ebon Netherscale Bracers
-            player->removeSpell(35575);                     // Ebon Netherscale Breastplate
-            player->removeSpell(35582);                     // Netherstrike Belt
-            player->removeSpell(35584);                     // Netherstrike Bracers
-            player->removeSpell(35580);                     // Netherstrike Breastplate
+            pPlayer->removeSpell(36076);                     // Dragonstrike Leggings
+            pPlayer->removeSpell(36079);                     // Golden Dragonstrike Breastplate
+            pPlayer->removeSpell(35576);                     // Ebon Netherscale Belt
+            pPlayer->removeSpell(35577);                     // Ebon Netherscale Bracers
+            pPlayer->removeSpell(35575);                     // Ebon Netherscale Breastplate
+            pPlayer->removeSpell(35582);                     // Netherstrike Belt
+            pPlayer->removeSpell(35584);                     // Netherstrike Bracers
+            pPlayer->removeSpell(35580);                     // Netherstrike Breastplate
             break;
         case 36328:                                         // S_UNLEARN_ELEMENTAL
-            player->removeSpell(36074);                     // Blackstorm Leggings
-            player->removeSpell(36077);                     // Primalstorm Breastplate
-            player->removeSpell(35590);                     // Primalstrike Belt
-            player->removeSpell(35591);                     // Primalstrike Bracers
-            player->removeSpell(35589);                     // Primalstrike Vest
+            pPlayer->removeSpell(36074);                     // Blackstorm Leggings
+            pPlayer->removeSpell(36077);                     // Primalstorm Breastplate
+            pPlayer->removeSpell(35590);                     // Primalstrike Belt
+            pPlayer->removeSpell(35591);                     // Primalstrike Bracers
+            pPlayer->removeSpell(35589);                     // Primalstrike Vest
             break;
         case 36433:                                         // S_UNLEARN_TRIBAL
-            player->removeSpell(35585);                     // Windhawk Hauberk
-            player->removeSpell(35587);                     // Windhawk Belt
-            player->removeSpell(35588);                     // Windhawk Bracers
-            player->removeSpell(36075);                     // Wildfeather Leggings
-            player->removeSpell(36078);                     // Living Crystal Breastplate
+            pPlayer->removeSpell(35585);                     // Windhawk Hauberk
+            pPlayer->removeSpell(35587);                     // Windhawk Belt
+            pPlayer->removeSpell(35588);                     // Windhawk Bracers
+            pPlayer->removeSpell(36075);                     // Wildfeather Leggings
+            pPlayer->removeSpell(36078);                     // Living Crystal Breastplate
             break;
         case 41299:                                         // S_UNLEARN_SPELLFIRE
-            player->removeSpell(26752);                     // Spellfire Belt
-            player->removeSpell(26753);                     // Spellfire Gloves
-            player->removeSpell(26754);                     // Spellfire Robe
+            pPlayer->removeSpell(26752);                     // Spellfire Belt
+            pPlayer->removeSpell(26753);                     // Spellfire Gloves
+            pPlayer->removeSpell(26754);                     // Spellfire Robe
             break;
         case 41558:                                         // S_UNLEARN_MOONCLOTH
-            player->removeSpell(26760);                     // Primal Mooncloth Belt
-            player->removeSpell(26761);                     // Primal Mooncloth Shoulders
-            player->removeSpell(26762);                     // Primal Mooncloth Robe
+            pPlayer->removeSpell(26760);                     // Primal Mooncloth Belt
+            pPlayer->removeSpell(26761);                     // Primal Mooncloth Shoulders
+            pPlayer->removeSpell(26762);                     // Primal Mooncloth Robe
             break;
         case 41559:                                         // S_UNLEARN_SHADOWEAVE
-            player->removeSpell(26756);                     // Frozen Shadoweave Shoulders
-            player->removeSpell(26757);                     // Frozen Shadoweave Boots
-            player->removeSpell(26758);                     // Frozen Shadoweave Robe
+            pPlayer->removeSpell(26756);                     // Frozen Shadoweave Shoulders
+            pPlayer->removeSpell(26757);                     // Frozen Shadoweave Boots
+            pPlayer->removeSpell(26758);                     // Frozen Shadoweave Robe
             break;
     }
 }
@@ -343,185 +343,185 @@ void ProfessionUnlearnSpells(Player *player, uint32 type)
 # start menues alchemy
 ###*/
 
-bool HasAlchemySpell(Player *player)
+bool HasAlchemySpell(Player* pPlayer)
 {
-    if(player->HasSpell(S_TRANSMUTE) || player->HasSpell(S_ELIXIR) || player->HasSpell(S_POTION))
+    if (pPlayer->HasSpell(S_TRANSMUTE) || pPlayer->HasSpell(S_ELIXIR) || pPlayer->HasSpell(S_POTION))
         return true;
     return false;
 }
 
-bool GossipHello_npc_prof_alchemy(Player *player, Creature *_Creature)
+bool GossipHello_npc_prof_alchemy(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
     if (_Creature->isVendor())
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
-    if(_Creature->isTrainer())
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+    if (_Creature->isTrainer())
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
 
     uint32 eCreature = _Creature->GetEntry();
 
-    if (player->HasSkill(SKILL_ALCHEMY) && player->GetBaseSkillValue(SKILL_ALCHEMY)>=350 && player->getLevel() > 67)
+    if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetBaseSkillValue(SKILL_ALCHEMY)>=350 && pPlayer->getLevel() > 67)
     {
-        if (player->GetQuestRewardStatus(10899) || player->GetQuestRewardStatus(10902) || player->GetQuestRewardStatus(10897))
+        if (pPlayer->GetQuestRewardStatus(10899) || pPlayer->GetQuestRewardStatus(10902) || pPlayer->GetQuestRewardStatus(10897))
         {
             switch (eCreature)
             {
                 case 22427:                                 //Zarevhi
-                    if (!HasAlchemySpell(player))
-                        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE,    GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 1);
-                    if (player->HasSpell(S_TRANSMUTE))
-                        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_TRANSMUTE,  GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 4);
+                    if (!HasAlchemySpell(pPlayer))
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE,    GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 1);
+                    if (pPlayer->HasSpell(S_TRANSMUTE))
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_TRANSMUTE,  GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 4);
                     break;
                 case 19052:                                 //Lorokeem
-                    if (!HasAlchemySpell(player))
-                        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR,       GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 2);
-                    if (player->HasSpell(S_ELIXIR))
-                        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_ELIXIR,     GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 5);
+                    if (!HasAlchemySpell(pPlayer))
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR,       GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 2);
+                    if (pPlayer->HasSpell(S_ELIXIR))
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_ELIXIR,     GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 5);
                     break;
                 case 17909:                                 //Lauranna Thar'well
-                    if (!HasAlchemySpell(player))
-                        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION,       GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 3);
-                    if (player->HasSpell(S_POTION))
-                        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_POTION,     GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 6);
+                    if (!HasAlchemySpell(pPlayer))
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION,       GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 3);
+                    if (pPlayer->HasSpell(S_POTION))
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_POTION,     GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 6);
                     break;
             }
         }
     }
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-void SendActionMenu_npc_prof_alchemy(Player *player, Creature *_Creature, uint32 action)
+void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch(action)
     {
         case GOSSIP_ACTION_TRADE:
-            player->SEND_VENDORLIST( _Creature->GetGUID() );
+            pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_TRAIN:
-            player->SEND_TRAINERLIST( _Creature->GetGUID() );
+            pPlayer->SEND_TRAINERLIST(_Creature->GetGUID());
             break;
             //Learn Alchemy
         case GOSSIP_ACTION_INFO_DEF + 1:
-            if(!player->HasSpell(S_TRANSMUTE) && player->GetMoney() >= DoLearnCost(player))
+            if (!pPlayer->HasSpell(S_TRANSMUTE) && pPlayer->GetMoney() >= DoLearnCost(pPlayer))
             {
-                player->CastSpell(player, S_LEARN_TRANSMUTE, true);
-                player->ModifyMoney(-DoLearnCost(player));
+                pPlayer->CastSpell(pPlayer, S_LEARN_TRANSMUTE, true);
+                pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
             } else
-            player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            if(!player->HasSpell(S_ELIXIR) && player->GetMoney() >= DoLearnCost(player))
+            if (!pPlayer->HasSpell(S_ELIXIR) && pPlayer->GetMoney() >= DoLearnCost(pPlayer))
             {
-                player->CastSpell(player, S_LEARN_ELIXIR, true);
-                player->ModifyMoney(-DoLearnCost(player));
+                pPlayer->CastSpell(pPlayer, S_LEARN_ELIXIR, true);
+                pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
             } else
-            player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
-            if(!player->HasSpell(S_POTION) && player->GetMoney() >= DoLearnCost(player))
+            if (!pPlayer->HasSpell(S_POTION) && pPlayer->GetMoney() >= DoLearnCost(pPlayer))
             {
-                player->CastSpell(player, S_LEARN_POTION, true);
-                player->ModifyMoney(-DoLearnCost(player));
+                pPlayer->CastSpell(pPlayer, S_LEARN_POTION, true);
+                pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
             } else
-            player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
             //Unlearn Alchemy
         case GOSSIP_ACTION_INFO_DEF + 4:
-            if(player->GetMoney() >= DoHighUnlearnCost(player))
+            if (pPlayer->GetMoney() >= DoHighUnlearnCost(pPlayer))
             {
-                _Creature->CastSpell(player, S_UNLEARN_TRANSMUTE, true);
-                player->ModifyMoney(-DoHighUnlearnCost(player));
+                _Creature->CastSpell(pPlayer, S_UNLEARN_TRANSMUTE, true);
+                pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
             } else
-            player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:
-            if(player->GetMoney() >= DoHighUnlearnCost(player))
+            if (pPlayer->GetMoney() >= DoHighUnlearnCost(pPlayer))
             {
-                _Creature->CastSpell(player, S_UNLEARN_ELIXIR, true);
-                player->ModifyMoney(-DoHighUnlearnCost(player));
+                _Creature->CastSpell(pPlayer, S_UNLEARN_ELIXIR, true);
+                pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
             } else
-            player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:
-            if(player->GetMoney() >= DoHighUnlearnCost(player))
+            if (pPlayer->GetMoney() >= DoHighUnlearnCost(pPlayer))
             {
-                _Creature->CastSpell(player, S_UNLEARN_POTION, true);
-                player->ModifyMoney(-DoHighUnlearnCost(player));
+                _Creature->CastSpell(pPlayer, S_UNLEARN_POTION, true);
+                pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
             } else
-            player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
     }
 }
 
-void SendConfirmLearn_npc_prof_alchemy(Player *player, Creature *_Creature, uint32 action)
+void SendConfirmLearn_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint32 action)
 {
-    if(action)
+    if (action)
     {
         uint32 eCreature = _Creature->GetEntry();
         switch(eCreature)
         {
             case 22427:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action);
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 19052:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR,    GOSSIP_SENDER_CHECK, action);
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR,    GOSSIP_SENDER_CHECK, action);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 17909:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION,    GOSSIP_SENDER_CHECK, action);
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION,    GOSSIP_SENDER_CHECK, action);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
         }
     }
 }
 
-void SendConfirmUnlearn_npc_prof_alchemy(Player *player, Creature *_Creature, uint32 action)
+void SendConfirmUnlearn_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint32 action)
 {
-    if(action)
+    if (action)
     {
         uint32 eCreature = _Creature->GetEntry();
         switch(eCreature)
         {
             case 22427:                                     //Zarevhi
-                player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player),false);
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 19052:                                     //Lorokeem
-                player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, action,    BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player),false);
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, action,    BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 17909:                                     //Lauranna Thar'well
-                player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, action,    BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player),false);
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, action,    BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
         }
     }
 }
 
-bool GossipSelect_npc_prof_alchemy(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_prof_alchemy(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch(sender)
     {
-        case GOSSIP_SENDER_MAIN:    SendActionMenu_npc_prof_alchemy(player, _Creature, action); break;
-        case GOSSIP_SENDER_LEARN:   SendConfirmLearn_npc_prof_alchemy(player, _Creature, action); break;
-        case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_alchemy(player, _Creature, action); break;
-        case GOSSIP_SENDER_CHECK:   SendActionMenu_npc_prof_alchemy(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:    SendActionMenu_npc_prof_alchemy(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_LEARN:   SendConfirmLearn_npc_prof_alchemy(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_alchemy(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_CHECK:   SendActionMenu_npc_prof_alchemy(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -530,232 +530,232 @@ bool GossipSelect_npc_prof_alchemy(Player *player, Creature *_Creature, uint32 s
 # start menues blacksmith
 ###*/
 
-bool HasWeaponSub(Player *player)
+bool HasWeaponSub(Player* pPlayer)
 {
-    if (player->HasSpell(S_HAMMER) || player->HasSpell(S_AXE) || player->HasSpell(S_SWORD))
+    if (pPlayer->HasSpell(S_HAMMER) || pPlayer->HasSpell(S_AXE) || pPlayer->HasSpell(S_SWORD))
         return true;
     return false;
 }
 
-bool GossipHello_npc_prof_blacksmith(Player *player, Creature *_Creature)
+bool GossipHello_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
     if (_Creature->isVendor())
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
-    if(_Creature->isTrainer())
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+    if (_Creature->isTrainer())
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
 
     uint32 eCreature = _Creature->GetEntry();
     //WEAPONSMITH & ARMORSMITH
-    if(player->GetBaseSkillValue(SKILL_BLACKSMITHING)>=225)
+    if (pPlayer->GetBaseSkillValue(SKILL_BLACKSMITHING)>=225)
     {
         switch (eCreature)
         {
             case 11145:                                     //Myolor Sunderfury
             case 11176:                                     //Krathok Moltenfist
-                if(!player->HasSpell(S_ARMOR) && !player->HasSpell(S_WEAPON) && player->GetReputationRank(REP_ARMOR) >=  REP_FRIENDLY)
-                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARMOR_LEARN,   GOSSIP_SENDER_MAIN,          GOSSIP_ACTION_INFO_DEF + 1);
-                if(!player->HasSpell(S_WEAPON) && !player->HasSpell(S_ARMOR) && player->GetReputationRank(REP_WEAPON) >= REP_FRIENDLY)
-                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEAPON_LEARN,  GOSSIP_SENDER_MAIN,          GOSSIP_ACTION_INFO_DEF + 2);
+                if (!pPlayer->HasSpell(S_ARMOR) && !pPlayer->HasSpell(S_WEAPON) && pPlayer->GetReputationRank(REP_ARMOR) >=  REP_FRIENDLY)
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARMOR_LEARN,   GOSSIP_SENDER_MAIN,          GOSSIP_ACTION_INFO_DEF + 1);
+                if (!pPlayer->HasSpell(S_WEAPON) && !pPlayer->HasSpell(S_ARMOR) && pPlayer->GetReputationRank(REP_WEAPON) >= REP_FRIENDLY)
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEAPON_LEARN,  GOSSIP_SENDER_MAIN,          GOSSIP_ACTION_INFO_DEF + 2);
                 break;
             case 11146:                                     //Ironus Coldsteel
             case 11178:                                     //Borgosh Corebender
-                if(player->HasSpell(S_WEAPON))
-                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEAPON_UNLEARN,    GOSSIP_SENDER_UNLEARN,   GOSSIP_ACTION_INFO_DEF + 3);
+                if (pPlayer->HasSpell(S_WEAPON))
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEAPON_UNLEARN,    GOSSIP_SENDER_UNLEARN,   GOSSIP_ACTION_INFO_DEF + 3);
                 break;
             case 5164:                                      //Grumnus Steelshaper
             case 11177:                                     //Okothos Ironrager
-                if(player->HasSpell(S_ARMOR))
-                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARMOR_UNLEARN,     GOSSIP_SENDER_UNLEARN,   GOSSIP_ACTION_INFO_DEF + 4);
+                if (pPlayer->HasSpell(S_ARMOR))
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ARMOR_UNLEARN,     GOSSIP_SENDER_UNLEARN,   GOSSIP_ACTION_INFO_DEF + 4);
                 break;
         }
     }
     //WEAPONSMITH SPEC
-    if(player->HasSpell(S_WEAPON) && player->getLevel() > 49 && player->GetBaseSkillValue(SKILL_BLACKSMITHING)>=250)
+    if (pPlayer->HasSpell(S_WEAPON) && pPlayer->getLevel() > 49 && pPlayer->GetBaseSkillValue(SKILL_BLACKSMITHING)>=250)
     {
         switch (eCreature)
         {
             case 11191:                                     //Lilith the Lithe
-                if(!HasWeaponSub(player))
-                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER,       GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 5);
-                if(player->HasSpell(S_HAMMER))
-                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_HAMMER,     GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 8);
+                if (!HasWeaponSub(pPlayer))
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER,       GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 5);
+                if (pPlayer->HasSpell(S_HAMMER))
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_HAMMER,     GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 8);
                 break;
             case 11192:                                     //Kilram
-                if(!HasWeaponSub(player))
-                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE,          GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 6);
-                if(player->HasSpell(S_AXE))
-                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_AXE,        GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 9);
+                if (!HasWeaponSub(pPlayer))
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE,          GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 6);
+                if (pPlayer->HasSpell(S_AXE))
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_AXE,        GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 9);
                 break;
             case 11193:                                     //Seril Scourgebane
-                if(!HasWeaponSub(player))
-                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD,        GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 7);
-                if(player->HasSpell(S_SWORD))
-                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SWORD,      GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 10);
+                if (!HasWeaponSub(pPlayer))
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD,        GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 7);
+                if (pPlayer->HasSpell(S_SWORD))
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SWORD,      GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 10);
                 break;
         }
     }
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-void SendActionMenu_npc_prof_blacksmith(Player *player, Creature *_Creature, uint32 action)
+void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch(action)
     {
         case GOSSIP_ACTION_TRADE:
-            player->SEND_VENDORLIST( _Creature->GetGUID() );
+            pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_TRAIN:
-            player->SEND_TRAINERLIST( _Creature->GetGUID() );
+            pPlayer->SEND_TRAINERLIST(_Creature->GetGUID());
             break;
             //Learn Armor/Weapon
         case GOSSIP_ACTION_INFO_DEF + 1:
-            if(!player->HasSpell(S_ARMOR))
+            if (!pPlayer->HasSpell(S_ARMOR))
             {
-                player->CastSpell(player, S_LEARN_ARMOR, true);
-                //_Creature->CastSpell(player, S_REP_ARMOR, true);
+                pPlayer->CastSpell(pPlayer, S_LEARN_ARMOR, true);
+                //_Creature->CastSpell(pPlayer, S_REP_ARMOR, true);
             }
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            if(!player->HasSpell(S_WEAPON))
+            if (!pPlayer->HasSpell(S_WEAPON))
             {
-                player->CastSpell(player, S_LEARN_WEAPON, true);
-                //_Creature->CastSpell(player, S_REP_WEAPON, true);
+                pPlayer->CastSpell(pPlayer, S_LEARN_WEAPON, true);
+                //_Creature->CastSpell(pPlayer, S_REP_WEAPON, true);
             }
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
             //Unlearn Armor/Weapon
         case GOSSIP_ACTION_INFO_DEF + 3:
-            if(HasWeaponSub(player))
+            if (HasWeaponSub(pPlayer))
             {
                                                             //unknown textID (TALK_MUST_UNLEARN_WEAPON)
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             }
-            else if( EquippedOk(player,S_UNLEARN_WEAPON) )
+            else if (EquippedOk(pPlayer,S_UNLEARN_WEAPON))
             {
-                if( player->GetMoney() >= DoLowUnlearnCost(player) )
+                if (pPlayer->GetMoney() >= DoLowUnlearnCost(pPlayer))
                 {
-                    player->CastSpell(player, S_UNLEARN_WEAPON, true);
-                    ProfessionUnlearnSpells(player, S_UNLEARN_WEAPON);
-                    player->ModifyMoney(-DoLowUnlearnCost(player));
-                    _Creature->CastSpell(player, S_REP_ARMOR, true);
-                    player->CLOSE_GOSSIP_MENU();
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_WEAPON, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_WEAPON);
+                    pPlayer->ModifyMoney(-DoLowUnlearnCost(pPlayer));
+                    _Creature->CastSpell(pPlayer, S_REP_ARMOR, true);
+                    pPlayer->CLOSE_GOSSIP_MENU();
                 } else
-                player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
             }
             else
             {
-                player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
-                player->CLOSE_GOSSIP_MENU();
+                pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+                pPlayer->CLOSE_GOSSIP_MENU();
             }
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:
-            if( EquippedOk(player,S_UNLEARN_ARMOR) )
+            if (EquippedOk(pPlayer,S_UNLEARN_ARMOR))
             {
-                if( player->GetMoney() >= DoLowUnlearnCost(player) )
+                if (pPlayer->GetMoney() >= DoLowUnlearnCost(pPlayer))
                 {
-                    player->CastSpell(player, S_UNLEARN_ARMOR, true);
-                    ProfessionUnlearnSpells(player, S_UNLEARN_ARMOR);
-                    player->ModifyMoney(-DoLowUnlearnCost(player));
-                    _Creature->CastSpell(player, S_REP_WEAPON, true);
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_ARMOR, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_ARMOR);
+                    pPlayer->ModifyMoney(-DoLowUnlearnCost(pPlayer));
+                    _Creature->CastSpell(pPlayer, S_REP_WEAPON, true);
                 } else
-                player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
             } else
-            player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
             //Learn Hammer/Axe/Sword
         case GOSSIP_ACTION_INFO_DEF + 5:
-            player->CastSpell(player, S_LEARN_HAMMER, true);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CastSpell(pPlayer, S_LEARN_HAMMER, true);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:
-            player->CastSpell(player, S_LEARN_AXE, true);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CastSpell(pPlayer, S_LEARN_AXE, true);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:
-            player->CastSpell(player, S_LEARN_SWORD, true);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CastSpell(pPlayer, S_LEARN_SWORD, true);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
             //Unlearn Hammer/Axe/Sword
         case GOSSIP_ACTION_INFO_DEF + 8:
-            if( EquippedOk(player,S_UNLEARN_HAMMER) )
+            if (EquippedOk(pPlayer,S_UNLEARN_HAMMER))
             {
-                if( player->GetMoney() >= DoMedUnlearnCost(player))
+                if (pPlayer->GetMoney() >= DoMedUnlearnCost(pPlayer))
                 {
-                    player->CastSpell(player, S_UNLEARN_HAMMER, true);
-                    ProfessionUnlearnSpells(player, S_UNLEARN_HAMMER);
-                    player->ModifyMoney(-DoMedUnlearnCost(player));
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_HAMMER, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_HAMMER);
+                    pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
                 } else
-                player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
             } else
-            player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:
-            if( EquippedOk(player,S_UNLEARN_AXE) )
+            if (EquippedOk(pPlayer,S_UNLEARN_AXE))
             {
-                if( player->GetMoney() >= DoMedUnlearnCost(player))
+                if (pPlayer->GetMoney() >= DoMedUnlearnCost(pPlayer))
                 {
-                    player->CastSpell(player, S_UNLEARN_AXE, true);
-                    ProfessionUnlearnSpells(player, S_UNLEARN_AXE);
-                    player->ModifyMoney(-DoMedUnlearnCost(player));
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_AXE, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_AXE);
+                    pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
                 } else
-                player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
             } else
-            player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:
-            if( EquippedOk(player,S_UNLEARN_SWORD) )
+            if (EquippedOk(pPlayer,S_UNLEARN_SWORD))
             {
-                if( player->GetMoney() >= DoMedUnlearnCost(player))
+                if (pPlayer->GetMoney() >= DoMedUnlearnCost(pPlayer))
                 {
-                    player->CastSpell(player, S_UNLEARN_SWORD, true);
-                    ProfessionUnlearnSpells(player, S_UNLEARN_SWORD);
-                    player->ModifyMoney(-DoMedUnlearnCost(player));
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_SWORD, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SWORD);
+                    pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
                 } else
-                player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
             } else
-            player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
     }
 }
 
-void SendConfirmLearn_npc_prof_blacksmith(Player *player, Creature *_Creature, uint32 action)
+void SendConfirmLearn_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, uint32 action)
 {
-    if(action)
+    if (action)
     {
         uint32 eCreature = _Creature->GetEntry();
         switch(eCreature)
         {
             case 11191:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, action);
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, action);
                                                             //unknown textID (TALK_HAMMER_LEARN)
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 11192:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE,    GOSSIP_SENDER_CHECK, action);
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE,    GOSSIP_SENDER_CHECK, action);
                                                             //unknown textID (TALK_AXE_LEARN)
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 11193:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD,  GOSSIP_SENDER_CHECK, action);
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD,  GOSSIP_SENDER_CHECK, action);
                                                             //unknown textID (TALK_SWORD_LEARN)
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
         }
     }
 }
 
-void SendConfirmUnlearn_npc_prof_blacksmith(Player *player, Creature *_Creature, uint32 action)
+void SendConfirmUnlearn_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, uint32 action)
 {
-    if(action)
+    if (action)
     {
         uint32 eCreature = _Creature->GetEntry();
         switch(eCreature)
@@ -764,49 +764,49 @@ void SendConfirmUnlearn_npc_prof_blacksmith(Player *player, Creature *_Creature,
             case 11178:                                     //Borgosh Corebender
             case 5164:                                      //Grumnus Steelshaper
             case 11177:                                     //Okothos Ironrager
-                player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(player),false);
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(pPlayer),false);
                                                             //unknown textID (TALK_UNLEARN_AXEORWEAPON)
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
 
             case 11191:
-                player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, action,    BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player),false);
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, action,    BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false);
                                                             //unknown textID (TALK_HAMMER_UNLEARN)
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 11192:
-                player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, action,       BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player),false);
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, action,       BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false);
                                                             //unknown textID (TALK_AXE_UNLEARN)
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 11193:
-                player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, action,     BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player),false);
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, action,     BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false);
                                                             //unknown textID (TALK_SWORD_UNLEARN)
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
         }
     }
 }
 
-bool GossipSelect_npc_prof_blacksmith(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch(sender)
     {
-        case GOSSIP_SENDER_MAIN:    SendActionMenu_npc_prof_blacksmith(player, _Creature, action); break;
-        case GOSSIP_SENDER_LEARN:   SendConfirmLearn_npc_prof_blacksmith(player, _Creature, action); break;
-        case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_blacksmith(player, _Creature, action); break;
-        case GOSSIP_SENDER_CHECK:   SendActionMenu_npc_prof_blacksmith(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:    SendActionMenu_npc_prof_blacksmith(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_LEARN:   SendConfirmLearn_npc_prof_blacksmith(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_blacksmith(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_CHECK:   SendActionMenu_npc_prof_blacksmith(pPlayer, _Creature, action); break;
     }
     return true;
 }
 
-/*bool QuestComplete_npc_prof_blacksmith( Player *player, Creature *_Creature, Quest const *_Quest )
+/*bool QuestComplete_npc_prof_blacksmith(Player* pPlayer, Creature *_Creature, Quest const *_Quest)
 {
-    if ( (_Quest->GetQuestId() == 5283) || (_Quest->GetQuestId() == 5301) )             //armorsmith
-        _Creature->CastSpell(player, 17451, true);
+    if ((_Quest->GetQuestId() == 5283) || (_Quest->GetQuestId() == 5301))             //armorsmith
+        _Creature->CastSpell(pPlayer, 17451, true);
 
-    if ( (_Quest->GetQuestId() == 5284) || (_Quest->GetQuestId() == 5302) )             //weaponsmith
-        _Creature->CastSpell(player, 17452, true);
+    if ((_Quest->GetQuestId() == 5284) || (_Quest->GetQuestId() == 5302))             //weaponsmith
+        _Creature->CastSpell(pPlayer, 17452, true);
 
     return true;
 }*/
@@ -847,68 +847,68 @@ bool GossipHello_npc_engineering_tele_trinket(Player* pPlayer, Creature* pCreatu
     std::string GossipItem;
     bool CanLearn = false;
 
-    if(pPlayer->HasSkill(SKILL_ENGINERING))
+    if (pPlayer->HasSkill(SKILL_ENGINERING))
     {
         switch(pCreature->GetEntry())
         {
             case NPC_ZAP:
                 NpcTextId = 7249;
-                if(pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 260 && pPlayer->HasSpell(S_GOBLIN))
+                if (pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 260 && pPlayer->HasSpell(S_GOBLIN))
                 {
-                    if(!pPlayer->HasSpell(SPELL_TO_EVERLOOK))
+                    if (!pPlayer->HasSpell(SPELL_TO_EVERLOOK))
                     {
                         CanLearn = true;
                         GossipItem = GOSSIP_ITEM_ZAP;
                     }
-                    else if(pPlayer->HasSpell(SPELL_TO_EVERLOOK))
+                    else if (pPlayer->HasSpell(SPELL_TO_EVERLOOK))
                         NpcTextId = 0;
                 }
                 break;
             case NPC_JHORDY:
                 NpcTextId = 7251;
-                if(pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 260 && pPlayer->HasSpell(S_GNOMISH))
+                if (pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 260 && pPlayer->HasSpell(S_GNOMISH))
                 {
-                    if(!pPlayer->HasSpell(SPELL_TO_GADGET))
+                    if (!pPlayer->HasSpell(SPELL_TO_GADGET))
                     {
                         CanLearn = true;
                         GossipItem = GOSSIP_ITEM_JHORDY;
                     }
-                    else if(pPlayer->HasSpell(SPELL_TO_GADGET))
+                    else if (pPlayer->HasSpell(SPELL_TO_GADGET))
                         NpcTextId = 7252;
                 }
                 break;
             case NPC_KABLAM:
                 NpcTextId = 10365;
-                if(pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 350 && pPlayer->HasSpell(S_GOBLIN))
+                if (pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 350 && pPlayer->HasSpell(S_GOBLIN))
                 {
-                    if(!pPlayer->HasSpell(SPELL_TO_AREA52))
+                    if (!pPlayer->HasSpell(SPELL_TO_AREA52))
                     {
                         CanLearn = true;
                         GossipItem = GOSSIP_ITEM_KABLAM;
                     }
-                    else if(pPlayer->HasSpell(SPELL_TO_AREA52))
+                    else if (pPlayer->HasSpell(SPELL_TO_AREA52))
                         NpcTextId = 0;
                 }
                 break;
             case NPC_SMILES:
                 NpcTextId = 10363;
-                if(pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 350 && pPlayer->HasSpell(S_GNOMISH))
+                if (pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 350 && pPlayer->HasSpell(S_GNOMISH))
                 {
-                    if(!pPlayer->HasSpell(SPELL_TO_TOSHLEY))
+                    if (!pPlayer->HasSpell(SPELL_TO_TOSHLEY))
                     {
                         CanLearn = true;
                         GossipItem = GOSSIP_ITEM_SMILES;
                     }
-                    else if(pPlayer->HasSpell(SPELL_TO_TOSHLEY))
+                    else if (pPlayer->HasSpell(SPELL_TO_TOSHLEY))
                         NpcTextId = 0;
                 }
                 break;
         }
     }
 
-    if(CanLearn)
+    if (CanLearn)
     {
-        if(pPlayer->HasItemCount(ITEM_GOBLIN_CARD,1) || pPlayer->HasItemCount(ITEM_GNOMISH_CARD,1))
+        if (pPlayer->HasItemCount(ITEM_GOBLIN_CARD,1) || pPlayer->HasItemCount(ITEM_GNOMISH_CARD,1))
             pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GossipItem, pCreature->GetEntry(), GOSSIP_ACTION_INFO_DEF+1);
     }
 
@@ -918,10 +918,10 @@ bool GossipHello_npc_engineering_tele_trinket(Player* pPlayer, Creature* pCreatu
 
 bool GossipSelect_npc_engineering_tele_trinket(Player* pPlayer, Creature* pCreature, uint32 Sender, uint32 Action)
 {
-    if(Action == GOSSIP_ACTION_INFO_DEF+1)
+    if (Action == GOSSIP_ACTION_INFO_DEF+1)
         pPlayer->CLOSE_GOSSIP_MENU();
 
-    if(Sender != pCreature->GetEntry())
+    if (Sender != pCreature->GetEntry())
         return true;
 
     switch(Sender)
@@ -947,135 +947,135 @@ bool GossipSelect_npc_engineering_tele_trinket(Player* pPlayer, Creature* pCreat
 # start menues leatherworking
 ###*/
 
-bool GossipHello_npc_prof_leather(Player *player, Creature *_Creature)
+bool GossipHello_npc_prof_leather(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
     if (_Creature->isVendor())
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
-    if(_Creature->isTrainer())
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+    if (_Creature->isTrainer())
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
 
     uint32 eCreature = _Creature->GetEntry();
 
-    if(player->HasSkill(SKILL_LEATHERWORKING) && player->GetBaseSkillValue(SKILL_LEATHERWORKING)>=250 && player->getLevel() > 49 )
+    if (pPlayer->HasSkill(SKILL_LEATHERWORKING) && pPlayer->GetBaseSkillValue(SKILL_LEATHERWORKING)>=250 && pPlayer->getLevel() > 49)
     {
         switch (eCreature)
         {
             case 7866:                                      //Peter Galen
             case 7867:                                      //Thorkaf Dragoneye
-                if(player->HasSpell(S_DRAGON))
-                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_DRAGON,      GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 1);
+                if (pPlayer->HasSpell(S_DRAGON))
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_DRAGON,      GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 1);
                 break;
             case 7868:                                      //Sarah Tanner
             case 7869:                                      //Brumn Winterhoof
-                if(player->HasSpell(S_ELEMENTAL))
-                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_ELEMENTAL,   GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 2);
+                if (pPlayer->HasSpell(S_ELEMENTAL))
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_ELEMENTAL,   GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 2);
                 break;
             case 7870:                                      //Caryssia Moonhunter
             case 7871:                                      //Se'Jib
-                if(player->HasSpell(S_TRIBAL))
-                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_TRIBAL,      GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 3);
+                if (pPlayer->HasSpell(S_TRIBAL))
+                    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_TRIBAL,      GOSSIP_SENDER_UNLEARN, GOSSIP_ACTION_INFO_DEF + 3);
                 break;
         }
     }
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-void SendActionMenu_npc_prof_leather(Player *player, Creature *_Creature, uint32 action)
+void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch(action)
     {
         case GOSSIP_ACTION_TRADE:
-            player->SEND_VENDORLIST( _Creature->GetGUID() );
+            pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_TRAIN:
-            player->SEND_TRAINERLIST( _Creature->GetGUID() );
+            pPlayer->SEND_TRAINERLIST(_Creature->GetGUID());
             break;
             //Unlearn Leather
         case GOSSIP_ACTION_INFO_DEF + 1:
-            if( EquippedOk(player,S_UNLEARN_DRAGON) )
+            if (EquippedOk(pPlayer,S_UNLEARN_DRAGON))
             {
-                if( player->GetMoney() >= DoMedUnlearnCost(player) )
+                if (pPlayer->GetMoney() >= DoMedUnlearnCost(pPlayer))
                 {
-                    player->CastSpell(player, S_UNLEARN_DRAGON, true);
-                    ProfessionUnlearnSpells(player, S_UNLEARN_DRAGON);
-                    player->ModifyMoney(-DoMedUnlearnCost(player));
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_DRAGON, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_DRAGON);
+                    pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
                 } else
-                player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
             } else
-            player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            if( EquippedOk(player,S_UNLEARN_ELEMENTAL) )
+            if (EquippedOk(pPlayer,S_UNLEARN_ELEMENTAL))
             {
-                if( player->GetMoney() >= DoMedUnlearnCost(player) )
+                if (pPlayer->GetMoney() >= DoMedUnlearnCost(pPlayer))
                 {
-                    player->CastSpell(player, S_UNLEARN_ELEMENTAL, true);
-                    ProfessionUnlearnSpells(player, S_UNLEARN_ELEMENTAL);
-                    player->ModifyMoney(-DoMedUnlearnCost(player));
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_ELEMENTAL, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_ELEMENTAL);
+                    pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
                 } else
-                player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
             } else
-            player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
-            if( EquippedOk(player,S_UNLEARN_TRIBAL) )
+            if (EquippedOk(pPlayer,S_UNLEARN_TRIBAL))
             {
-                if(player->GetMoney() >= DoMedUnlearnCost(player))
+                if (pPlayer->GetMoney() >= DoMedUnlearnCost(pPlayer))
                 {
-                    player->CastSpell(player, S_UNLEARN_TRIBAL, true);
-                    ProfessionUnlearnSpells(player, S_UNLEARN_TRIBAL);
-                    player->ModifyMoney(-DoMedUnlearnCost(player));
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_TRIBAL, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_TRIBAL);
+                    pPlayer->ModifyMoney(-DoMedUnlearnCost(pPlayer));
                 } else
-                player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
             } else
-            player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
     }
 }
 
-void SendConfirmUnlearn_npc_prof_leather(Player *player, Creature *_Creature, uint32 action)
+void SendConfirmUnlearn_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint32 action)
 {
-    if(action)
+    if (action)
     {
         uint32 eCreature = _Creature->GetEntry();
         switch(eCreature)
         {
             case 7866:                                      //Peter Galen
             case 7867:                                      //Thorkaf Dragoneye
-                player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, action,    BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player),false);
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, action,    BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 7868:                                      //Sarah Tanner
             case 7869:                                      //Brumn Winterhoof
-                player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player),false);
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 7870:                                      //Caryssia Moonhunter
             case 7871:                                      //Se'Jib
-                player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, action,    BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player),false);
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, action,    BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
         }
     }
 }
 
-bool GossipSelect_npc_prof_leather(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_prof_leather(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch(sender)
     {
-        case GOSSIP_SENDER_MAIN:    SendActionMenu_npc_prof_leather(player, _Creature, action); break;
-        case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_leather(player, _Creature, action); break;
-        case GOSSIP_SENDER_CHECK:   SendActionMenu_npc_prof_leather(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:    SendActionMenu_npc_prof_leather(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_leather(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_CHECK:   SendActionMenu_npc_prof_leather(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -1084,200 +1084,200 @@ bool GossipSelect_npc_prof_leather(Player *player, Creature *_Creature, uint32 s
 # start menues tailoring
 ###*/
 
-bool HasTailorSpell(Player *player)
+bool HasTailorSpell(Player* pPlayer)
 {
-    if (player->HasSpell(S_MOONCLOTH) || player->HasSpell(S_SHADOWEAVE) || player->HasSpell(S_SPELLFIRE))
+    if (pPlayer->HasSpell(S_MOONCLOTH) || pPlayer->HasSpell(S_SHADOWEAVE) || pPlayer->HasSpell(S_SPELLFIRE))
         return true;
     return false;
 }
 
-bool GossipHello_npc_prof_tailor(Player *player, Creature *_Creature)
+bool GossipHello_npc_prof_tailor(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
     if (_Creature->isVendor())
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
     if (_Creature->isTrainer())
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
 
     uint32 eCreature = _Creature->GetEntry();
                                                             //TAILORING SPEC
-    if (player->HasSkill(SKILL_TAILORING) && player->GetBaseSkillValue(SKILL_TAILORING)>=350 && player->getLevel() > 59)
+    if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING)>=350 && pPlayer->getLevel() > 59)
     {
-        if (player->GetQuestRewardStatus(10831) || player->GetQuestRewardStatus(10832) || player->GetQuestRewardStatus(10833))
+        if (pPlayer->GetQuestRewardStatus(10831) || pPlayer->GetQuestRewardStatus(10832) || pPlayer->GetQuestRewardStatus(10833))
         {
             switch (eCreature)
             {
                 case 22213:                                 //Gidge Spellweaver
-                    if (!HasTailorSpell(player))
-                        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE,    GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 1);
-                    if (player->HasSpell(S_SPELLFIRE))
-                        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SPELLFIRE,  GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 4);
+                    if (!HasTailorSpell(pPlayer))
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE,    GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 1);
+                    if (pPlayer->HasSpell(S_SPELLFIRE))
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SPELLFIRE,  GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 4);
                     break;
                 case 22208:                                 //Nasmara Moonsong
-                    if (!HasTailorSpell(player))
-                        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH,    GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 2);
-                    if (player->HasSpell(S_MOONCLOTH))
-                        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_MOONCLOTH,  GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 5);
+                    if (!HasTailorSpell(pPlayer))
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH,    GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 2);
+                    if (pPlayer->HasSpell(S_MOONCLOTH))
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_MOONCLOTH,  GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 5);
                     break;
                 case 22212:                                 //Andrion Darkspinner
-                    if (!HasTailorSpell(player))
-                        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE,   GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 3);
-                    if (player->HasSpell(S_SHADOWEAVE))
-                        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 6);
+                    if (!HasTailorSpell(pPlayer))
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE,   GOSSIP_SENDER_LEARN,    GOSSIP_ACTION_INFO_DEF + 3);
+                    if (pPlayer->HasSpell(S_SHADOWEAVE))
+                        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_UNLEARN,  GOSSIP_ACTION_INFO_DEF + 6);
                     break;
             }
         }
     }
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-void SendActionMenu_npc_prof_tailor(Player *player, Creature *_Creature, uint32 action)
+void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch(action)
     {
         case GOSSIP_ACTION_TRADE:
-            player->SEND_VENDORLIST( _Creature->GetGUID() );
+            pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_TRAIN:
-            player->SEND_TRAINERLIST( _Creature->GetGUID() );
+            pPlayer->SEND_TRAINERLIST(_Creature->GetGUID());
             break;
             //Learn Tailor
         case GOSSIP_ACTION_INFO_DEF + 1:
-            if(!player->HasSpell(S_SPELLFIRE) && player->GetMoney() >= DoLearnCost(player))
+            if (!pPlayer->HasSpell(S_SPELLFIRE) && pPlayer->GetMoney() >= DoLearnCost(pPlayer))
             {
-                player->CastSpell(player, S_LEARN_SPELLFIRE, true);
-                player->ModifyMoney(-DoLearnCost(player));
+                pPlayer->CastSpell(pPlayer, S_LEARN_SPELLFIRE, true);
+                pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
             } else
-            player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            if(!player->HasSpell(S_MOONCLOTH) && player->GetMoney() >= DoLearnCost(player))
+            if (!pPlayer->HasSpell(S_MOONCLOTH) && pPlayer->GetMoney() >= DoLearnCost(pPlayer))
             {
-                player->CastSpell(player, S_LEARN_MOONCLOTH, true);
-                player->ModifyMoney(-DoLearnCost(player));
+                pPlayer->CastSpell(pPlayer, S_LEARN_MOONCLOTH, true);
+                pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
             } else
-            player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
-            if(!player->HasSpell(S_SHADOWEAVE) && player->GetMoney() >= DoLearnCost(player))
+            if (!pPlayer->HasSpell(S_SHADOWEAVE) && pPlayer->GetMoney() >= DoLearnCost(pPlayer))
             {
-                player->CastSpell(player, S_LEARN_SHADOWEAVE, true);
-                player->ModifyMoney(-DoLearnCost(player));
+                pPlayer->CastSpell(pPlayer, S_LEARN_SHADOWEAVE, true);
+                pPlayer->ModifyMoney(-DoLearnCost(pPlayer));
             } else
-            player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
             //Unlearn Tailor
         case GOSSIP_ACTION_INFO_DEF + 4:
-            if( EquippedOk(player,S_UNLEARN_SPELLFIRE) )
+            if (EquippedOk(pPlayer,S_UNLEARN_SPELLFIRE))
             {
-                if( player->GetMoney() >= DoHighUnlearnCost(player) )
+                if (pPlayer->GetMoney() >= DoHighUnlearnCost(pPlayer))
                 {
-                    player->CastSpell(player, S_UNLEARN_SPELLFIRE, true);
-                    ProfessionUnlearnSpells(player, S_UNLEARN_SPELLFIRE);
-                    player->ModifyMoney(-DoHighUnlearnCost(player));
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_SPELLFIRE, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SPELLFIRE);
+                    pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
                 } else
-                player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
             } else
-            player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:
-            if( EquippedOk(player,S_UNLEARN_MOONCLOTH) )
+            if (EquippedOk(pPlayer,S_UNLEARN_MOONCLOTH))
             {
-                if( player->GetMoney() >= DoHighUnlearnCost(player) )
+                if (pPlayer->GetMoney() >= DoHighUnlearnCost(pPlayer))
                 {
-                    player->CastSpell(player, S_UNLEARN_MOONCLOTH, true);
-                    ProfessionUnlearnSpells(player, S_UNLEARN_MOONCLOTH);
-                    player->ModifyMoney(-DoHighUnlearnCost(player));
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_MOONCLOTH, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_MOONCLOTH);
+                    pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
                 } else
-                player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
             } else
-            player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:
-            if( EquippedOk(player,S_UNLEARN_SHADOWEAVE) )
+            if (EquippedOk(pPlayer,S_UNLEARN_SHADOWEAVE))
             {
-                if( player->GetMoney() >= DoHighUnlearnCost(player) )
+                if (pPlayer->GetMoney() >= DoHighUnlearnCost(pPlayer))
                 {
-                    player->CastSpell(player, S_UNLEARN_SHADOWEAVE, true);
-                    ProfessionUnlearnSpells(player, S_UNLEARN_SHADOWEAVE);
-                    player->ModifyMoney(-DoHighUnlearnCost(player));
+                    pPlayer->CastSpell(pPlayer, S_UNLEARN_SHADOWEAVE, true);
+                    ProfessionUnlearnSpells(pPlayer, S_UNLEARN_SHADOWEAVE);
+                    pPlayer->ModifyMoney(-DoHighUnlearnCost(pPlayer));
                 } else
-                player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
+                pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, _Creature, 0, 0);
             } else
-            player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
     }
 }
 
-void SendConfirmLearn_npc_prof_tailor(Player *player, Creature *_Creature, uint32 action)
+void SendConfirmLearn_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 action)
 {
-    if(action)
+    if (action)
     {
         uint32 eCreature = _Creature->GetEntry();
         switch(eCreature)
         {
             case 22213:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action);
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 22208:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH,    GOSSIP_SENDER_CHECK, action);
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH,    GOSSIP_SENDER_CHECK, action);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 22212:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE,  GOSSIP_SENDER_CHECK, action);
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE,  GOSSIP_SENDER_CHECK, action);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
         }
     }
 }
 
-void SendConfirmUnlearn_npc_prof_tailor(Player *player, Creature *_Creature, uint32 action)
+void SendConfirmUnlearn_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 action)
 {
-    if(action)
+    if (action)
     {
         uint32 eCreature = _Creature->GetEntry();
         switch(eCreature)
         {
             case 22213:                                     //Gidge Spellweaver
-                player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player),false);
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 22208:                                     //Nasmara Moonsong
-                player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player),false);
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
             case 22212:                                     //Andrion Darkspinner
-                player->ADD_GOSSIP_ITEM_EXTENDED( 0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, action,BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player),false);
+                pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, action,BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false);
                                                             //unknown textID ()
-                player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+                pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
                 break;
         }
     }
 }
 
-bool GossipSelect_npc_prof_tailor(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_prof_tailor(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch(sender)
     {
-        case GOSSIP_SENDER_MAIN:    SendActionMenu_npc_prof_tailor(player, _Creature, action); break;
-        case GOSSIP_SENDER_LEARN:   SendConfirmLearn_npc_prof_tailor(player, _Creature, action); break;
-        case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_tailor(player, _Creature, action); break;
-        case GOSSIP_SENDER_CHECK:   SendActionMenu_npc_prof_tailor(player, _Creature, action); break;
+        case GOSSIP_SENDER_MAIN:    SendActionMenu_npc_prof_tailor(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_LEARN:   SendConfirmLearn_npc_prof_tailor(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_tailor(pPlayer, _Creature, action); break;
+        case GOSSIP_SENDER_CHECK:   SendActionMenu_npc_prof_tailor(pPlayer, _Creature, action); break;
     }
     return true;
 }
@@ -1286,11 +1286,11 @@ bool GossipSelect_npc_prof_tailor(Player *player, Creature *_Creature, uint32 se
 # start menues for GO (engineering and leatherworking)
 ###*/
 
-/*bool GOHello_go_soothsaying_for_dummies(Player *player, GameObject* _GO)
+/*bool GOHello_go_soothsaying_for_dummies(Player* pPlayer, GameObject* _GO)
 {
-    player->PlayerTalkClass->GetGossipMenu()->AddMenuItem(0,GOSSIP_LEARN_DRAGON, GOSSIP_SENDER_INFO, GOSSIP_ACTION_INFO_DEF, "", 0);
+    pPlayer->PlayerTalkClass->GetGossipMenu()->AddMenuItem(0,GOSSIP_LEARN_DRAGON, GOSSIP_SENDER_INFO, GOSSIP_ACTION_INFO_DEF, "", 0);
 
-    player->SEND_GOSSIP_MENU(5584, _GO->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(5584, _GO->GetGUID());
 
     return true;
 }*/
diff --git a/src/bindings/scripts/scripts/npc/npc_taxi.cpp b/src/bindings/scripts/scripts/npc/npc_taxi.cpp
index f38f756d394..2d2ed6722d1 100644
--- a/src/bindings/scripts/scripts/npc/npc_taxi.cpp
+++ b/src/bindings/scripts/scripts/npc/npc_taxi.cpp
@@ -24,226 +24,226 @@ EndScriptData
 
 #include "precompiled.h"
 
-bool GossipHello_npc_taxi(Player *player, Creature *_Creature)
+bool GossipHello_npc_taxi(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
     switch(_Creature->GetEntry()) {
     case 17435: // Azuremyst Isle - Susurrus
-        if (player->HasItemCount(23843,1,true))
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        if (pPlayer->HasItemCount(23843,1,true))
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
         break;
     case 20903: // Netherstorm - Protectorate Nether Drake
-        if(player->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && player->HasItemCount(29778,1))
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'm ready to fly! Take me up, dragon!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        if (pPlayer->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(29778,1))
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'm ready to fly! Take me up, dragon!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
         break;
     case 18725: // Old Hillsbrad Foothills - Brazen
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready to go to Durnholde Keep.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready to go to Durnholde Keep.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
         break;
     case 29154: // Stormwind City - Thargold Ironwing
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'd like to take a flight around Stormwind Harbor.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'd like to take a flight around Stormwind Harbor.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
         break;
     case 19409: // Hellfire Peninsula - Wing Commander Dabir'ee
         //Mission: The Murketh and Shaadraz Gateways
-        if (player->GetQuestStatus(10146) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Murketh and Shaadraz Gateways", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+        if (pPlayer->GetQuestStatus(10146) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Murketh and Shaadraz Gateways", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
 
         //Shatter Point
-        if (!player->GetQuestRewardStatus(10340))
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Shatter Point", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+        if (!pPlayer->GetQuestRewardStatus(10340))
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Shatter Point", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
         break;
     case 20235: // Hellfire Peninsula - Gryphoneer Windbellow
         //Mission: The Abyssal Shelf || Return to the Abyssal Shelf
-        if (player->GetQuestStatus(10163) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10346) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to The Abyssal Shelf", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+        if (pPlayer->GetQuestStatus(10163) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10346) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to The Abyssal Shelf", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
 
         //Go to the Front
-        if (player->GetQuestStatus(10382) != QUEST_STATUS_NONE && !player->GetQuestRewardStatus(10382))
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Honor Point", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+        if (pPlayer->GetQuestStatus(10382) != QUEST_STATUS_NONE && !pPlayer->GetQuestRewardStatus(10382))
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Honor Point", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
         break;
     case 19401: // Hellfire Peninsula - Wing Commander Brack
         //Mission: The Murketh and Shaadraz Gateways
-        if (player->GetQuestStatus(10129) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Murketh and Shaadraz Gateways", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+        if (pPlayer->GetQuestStatus(10129) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Murketh and Shaadraz Gateways", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
 
         //Mission: The Abyssal Shelf || Return to the Abyssal Shelf
-        if (player->GetQuestStatus(10162) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10347) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to The Abyssal Shelf", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+        if (pPlayer->GetQuestStatus(10162) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10347) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to The Abyssal Shelf", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
 
         //Spinebreaker Post
-        if (player->GetQuestStatus(10242) == QUEST_STATUS_COMPLETE && !player->GetQuestRewardStatus(10242))
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Spinebreaker Post", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+        if (pPlayer->GetQuestStatus(10242) == QUEST_STATUS_COMPLETE && !pPlayer->GetQuestRewardStatus(10242))
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Spinebreaker Post", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
         break;
     case 23413: // Blade's Edge Mountains - Skyguard Handler Irena
-        if (player->GetReputationRank(1031) >= REP_HONORED)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Skettis please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+        if (pPlayer->GetReputationRank(1031) >= REP_HONORED)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Skettis please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
         break;
     case 25059: // Isle of Quel'Danas - Ayren Cloudbreaker
-        if (player->GetQuestStatus(11532) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(11533) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Speaking of action, I've been ordered to undertake an air strike.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
+        if (pPlayer->GetQuestStatus(11532) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(11533) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Speaking of action, I've been ordered to undertake an air strike.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
 
-        if (player->GetQuestStatus(11542) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(11543) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need to intercept the Dawnblade reinforcements.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
+        if (pPlayer->GetQuestStatus(11542) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(11543) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need to intercept the Dawnblade reinforcements.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
         break;
     case 25236: // Isle of Quel'Danas - Unrestrained Dragonhawk
-        if (player->GetQuestStatus(11542) == QUEST_STATUS_COMPLETE || player->GetQuestStatus(11543) == QUEST_STATUS_COMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "<Ride the dragonhawk to Sun's Reach>", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
+        if (pPlayer->GetQuestStatus(11542) == QUEST_STATUS_COMPLETE || pPlayer->GetQuestStatus(11543) == QUEST_STATUS_COMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "<Ride the dragonhawk to Sun's Reach>", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
         break;
     case 20162: // Netherstorm - Veronia
         //Behind Enemy Lines
-        if (player->GetQuestStatus(10652) && !player->GetQuestRewardStatus(10652))
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Manaforge Coruu please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15);
+        if (pPlayer->GetQuestStatus(10652) && !pPlayer->GetQuestRewardStatus(10652))
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Manaforge Coruu please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15);
         break;
     case 23415: // Terokkar Forest - Skyguard Handler Deesak
-        if (player->GetReputationRank(1031) >= REP_HONORED)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Ogri'la please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 16);
+        if (pPlayer->GetReputationRank(1031) >= REP_HONORED)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Ogri'la please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 16);
         break;
     case 27575: // Dragonblight - Lord Afrasastrasz
         // middle -> ground
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I would like to take a flight to the ground, Lord Of Afrasastrasz.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 17);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I would like to take a flight to the ground, Lord Of Afrasastrasz.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 17);
         // middle -> top
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "My Lord, I must go to the upper floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 18);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "My Lord, I must go to the upper floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 18);
         break;
     case 26443: // Dragonblight - Tariolstrasz //need to check if quests are required before gossip available (12123, 12124)
         // ground -> top
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "My Lord, I must go to the upper floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 19);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "My Lord, I must go to the upper floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 19);
         // ground -> middle
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Can you spare a drake to travel to Lord Of Afrasastrasz, in the middle of the temple?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 20);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Can you spare a drake to travel to Lord Of Afrasastrasz, in the middle of the temple?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 20);
         break;
     case 26949: // Dragonblight - Torastrasza
         // top -> middle
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I would like to see Lord Of Afrasastrasz, in the middle of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I would like to see Lord Of Afrasastrasz, in the middle of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
         // top -> ground
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes, Please. I would like to return to the ground floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes, Please. I would like to return to the ground floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
         break;
     case 23816: // Howling Fjord - Bat Handler Camille
-        if (!player->GetQuestRewardStatus(11229))
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need to fly to the Windrunner Official business!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
-        if (player->GetQuestStatus(11170) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need to commandeer a riding bat for special assignment for us.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
+        if (!pPlayer->GetQuestRewardStatus(11229))
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need to fly to the Windrunner Official business!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
+        if (pPlayer->GetQuestStatus(11170) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need to commandeer a riding bat for special assignment for us.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
         break;
     case 23704: // Dustwallow Marsh - Cassa Crimsonwing
-        if (player->GetQuestStatus(11142) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,"<Ride the gryphons to Survey Alcaz Island>",GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+25);
+        if (pPlayer->GetQuestStatus(11142) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,"<Ride the gryphons to Survey Alcaz Island>",GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+25);
         break;
     }
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_taxi(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch(action) {
     case GOSSIP_ACTION_INFO_DEF:
         //spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506.
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,32474,true);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,32474,true);
         break;
     case GOSSIP_ACTION_INFO_DEF + 1:
-        player->CLOSE_GOSSIP_MENU();
-        player->ActivateTaxiPathTo(627);                  //TaxiPath 627 (possibly 627+628(152->153->154->155) )
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->ActivateTaxiPathTo(627);                  //TaxiPath 627 (possibly 627+628(152->153->154->155))
         break;
     case GOSSIP_ACTION_INFO_DEF + 2:
-        if( !player->HasItemCount(25853,1) ) {
-            player->SEND_GOSSIP_MENU(9780, _Creature->GetGUID());
+        if (!pPlayer->HasItemCount(25853,1)) {
+            pPlayer->SEND_GOSSIP_MENU(9780, _Creature->GetGUID());
         } else {
-            player->CLOSE_GOSSIP_MENU();
-            player->ActivateTaxiPathTo(534);              //TaxiPath 534
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->ActivateTaxiPathTo(534);              //TaxiPath 534
         }
         break;
     case GOSSIP_ACTION_INFO_DEF + 3:
-        player->CLOSE_GOSSIP_MENU();
-        player->GetSession()->SendDoFlight(1149, 1041);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->GetSession()->SendDoFlight(1149, 1041);
         break;
     case GOSSIP_ACTION_INFO_DEF + 4:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,33768,true);               //TaxiPath 585 (Gateways Murket and Shaadraz)
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,33768,true);               //TaxiPath 585 (Gateways Murket and Shaadraz)
         break;
     case GOSSIP_ACTION_INFO_DEF + 5:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,35069,true);               //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point)
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,35069,true);               //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point)
         break;
     case GOSSIP_ACTION_INFO_DEF + 6:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,33899,true);               //TaxiPath 589 (Aerial Assault Flight (Alliance))
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,33899,true);               //TaxiPath 589 (Aerial Assault Flight (Alliance))
         break;
     case GOSSIP_ACTION_INFO_DEF + 7:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,35065,true);               //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head)
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,35065,true);               //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head)
         break;
     case GOSSIP_ACTION_INFO_DEF + 8:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,33659,true);               //TaxiPath 584 (Gateways Murket and Shaadraz)
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,33659,true);               //TaxiPath 584 (Gateways Murket and Shaadraz)
         break;
     case GOSSIP_ACTION_INFO_DEF + 9:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,33825,true);               //TaxiPath 587 (Aerial Assault Flight (Horde))
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,33825,true);               //TaxiPath 587 (Aerial Assault Flight (Horde))
         break;
     case GOSSIP_ACTION_INFO_DEF + 10:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,34578,true);               //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge)
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,34578,true);               //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge)
         break;
     case GOSSIP_ACTION_INFO_DEF + 11:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,41278,true);               //TaxiPath 706
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,41278,true);               //TaxiPath 706
         break;
     case GOSSIP_ACTION_INFO_DEF + 12:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,45071,true);               //TaxiPath 779
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,45071,true);               //TaxiPath 779
         break;
     case GOSSIP_ACTION_INFO_DEF + 13:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,45113,true);               //TaxiPath 784
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,45113,true);               //TaxiPath 784
         break;
     case GOSSIP_ACTION_INFO_DEF + 14:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,45353,true);               //TaxiPath 788
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,45353,true);               //TaxiPath 788
         break;
     case GOSSIP_ACTION_INFO_DEF + 15:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,34905,true);               //TaxiPath 606
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,34905,true);               //TaxiPath 606
         break;
     case GOSSIP_ACTION_INFO_DEF + 16:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,41279,true);               //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost)
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,41279,true);               //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost)
         break;
     case GOSSIP_ACTION_INFO_DEF + 17:
-        player->CLOSE_GOSSIP_MENU();
-        player->ActivateTaxiPathTo(882);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->ActivateTaxiPathTo(882);
         break;
     case GOSSIP_ACTION_INFO_DEF + 18:
-        player->CLOSE_GOSSIP_MENU();
-        player->ActivateTaxiPathTo(881);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->ActivateTaxiPathTo(881);
         break;
     case GOSSIP_ACTION_INFO_DEF + 19:
-        player->CLOSE_GOSSIP_MENU();
-        player->ActivateTaxiPathTo(878);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->ActivateTaxiPathTo(878);
         break;
     case GOSSIP_ACTION_INFO_DEF + 20:
-        player->CLOSE_GOSSIP_MENU();
-        player->ActivateTaxiPathTo(883);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->ActivateTaxiPathTo(883);
         break;
     case GOSSIP_ACTION_INFO_DEF + 21:
-        player->CLOSE_GOSSIP_MENU();
-        player->ActivateTaxiPathTo(880);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->ActivateTaxiPathTo(880);
         break;
     case GOSSIP_ACTION_INFO_DEF + 22:
-        player->CLOSE_GOSSIP_MENU();
-        player->ActivateTaxiPathTo(879);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->ActivateTaxiPathTo(879);
         break;
     case GOSSIP_ACTION_INFO_DEF + 23:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,43074,true);               //TaxiPath 736
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,43074,true);               //TaxiPath 736
         break;
     case GOSSIP_ACTION_INFO_DEF + 24:
-        player->CLOSE_GOSSIP_MENU();
-        player->ActivateTaxiPathTo(738);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->ActivateTaxiPathTo(738);
         break;
     case GOSSIP_ACTION_INFO_DEF + 25:
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,42295,true);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,42295,true);
         break;
     }
 
diff --git a/src/bindings/scripts/scripts/npc/npcs_special.cpp b/src/bindings/scripts/scripts/npc/npcs_special.cpp
index 5b178081a37..afce32ec7a8 100644
--- a/src/bindings/scripts/scripts/npc/npcs_special.cpp
+++ b/src/bindings/scripts/scripts/npc/npcs_special.cpp
@@ -276,25 +276,25 @@ struct TRINITY_DLL_DECL npc_chicken_cluckAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         // Reset flags after a certain time has passed so that the next player has to start the 'event' again
-        if(m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER))
+        if (m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER))
         {
-            if(ResetFlagTimer < diff)
+            if (ResetFlagTimer < diff)
             {
                 EnterEvadeMode();
                 return;
             }else ResetFlagTimer -= diff;
         }
 
-        if(UpdateVictim())
+        if (UpdateVictim())
             DoMeleeAttackIfReady();
     }
 
-    void ReceiveEmote( Player *player, uint32 emote )
+    void ReceiveEmote(Player* pPlayer, uint32 emote)
     {
-        switch( emote )
+        switch(emote)
         {
             case TEXTEMOTE_CHICKEN:
-                if( player->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand()%30 == 1 )
+                if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand()%30 == 1)
                 {
                     m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
                     m_creature->setFaction(FACTION_FRIENDLY);
@@ -302,7 +302,7 @@ struct TRINITY_DLL_DECL npc_chicken_cluckAI : public ScriptedAI
                 }
                 break;
             case TEXTEMOTE_CHEER:
-                if( player->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_COMPLETE )
+                if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_COMPLETE)
                 {
                     m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
                     m_creature->setFaction(FACTION_FRIENDLY);
@@ -318,17 +318,17 @@ CreatureAI* GetAI_npc_chicken_cluck(Creature *_Creature)
     return new npc_chicken_cluckAI(_Creature);
 }
 
-bool QuestAccept_npc_chicken_cluck(Player *player, Creature *_Creature, const Quest *_Quest )
+bool QuestAccept_npc_chicken_cluck(Player* pPlayer, Creature *_Creature, const Quest *_Quest)
 {
-    if(_Quest->GetQuestId() == QUEST_CLUCK)
+    if (_Quest->GetQuestId() == QUEST_CLUCK)
         CAST_AI(npc_chicken_cluckAI, _Creature->AI())->Reset();
 
     return true;
 }
 
-bool QuestComplete_npc_chicken_cluck(Player *player, Creature *_Creature, const Quest *_Quest)
+bool QuestComplete_npc_chicken_cluck(Player* pPlayer, Creature *_Creature, const Quest *_Quest)
 {
-    if(_Quest->GetQuestId() == QUEST_CLUCK)
+    if (_Quest->GetQuestId() == QUEST_CLUCK)
         CAST_AI(npc_chicken_cluckAI, _Creature->AI())->Reset();
 
     return true;
@@ -369,7 +369,7 @@ struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI
     {
         if (!active)
         {
-            if(can_iteract <= diff){
+            if (can_iteract <= diff){
                 active = true;
                 can_iteract = 3500;
                 m_creature->HandleEmoteCommand(EMOTE_ONESHOT_DANCE);
@@ -379,11 +379,11 @@ struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI
 
     void EnterCombat(Unit* who){}
 
-    void ReceiveEmote( Player *player, uint32 emote )
+    void ReceiveEmote(Player* pPlayer, uint32 emote)
     {
-        if (m_creature->IsWithinLOS(player->GetPositionX(),player->GetPositionY(),player->GetPositionZ()) && m_creature->IsWithinDistInMap(player,30.0f))
+        if (m_creature->IsWithinLOS(pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ()) && m_creature->IsWithinDistInMap(pPlayer,30.0f))
         {
-            m_creature->SetInFront(player);
+            m_creature->SetInFront(pPlayer);
             active = false;
 
             WorldPacket data;
@@ -397,8 +397,8 @@ struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI
                 case TEXTEMOTE_JOKE:    m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break;
                 case TEXTEMOTE_DANCE:
                 {
-                    if (!player->HasAura(SPELL_SEDUCTION))
-                        m_creature->CastSpell(player,SPELL_SEDUCTION,true);
+                    if (!pPlayer->HasAura(SPELL_SEDUCTION))
+                        m_creature->CastSpell(pPlayer,SPELL_SEDUCTION,true);
                 }
                 break;
             }
@@ -482,7 +482,7 @@ struct TRINITY_DLL_DECL npc_doctorAI : public ScriptedAI
 {
     npc_doctorAI(Creature *c) : ScriptedAI(c) {}
 
-    uint64 Playerguid;
+    uint64 PlayerGUID;
 
     uint32 SummonPatient_Timer;
     uint32 SummonPatientCount;
@@ -496,7 +496,7 @@ struct TRINITY_DLL_DECL npc_doctorAI : public ScriptedAI
 
     void Reset()
     {
-        Playerguid = 0;
+        PlayerGUID = 0;
 
         SummonPatient_Timer = 10000;
         SummonPatientCount = 0;
@@ -511,9 +511,9 @@ struct TRINITY_DLL_DECL npc_doctorAI : public ScriptedAI
         m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
     }
 
-    void BeginEvent(Player* player);
+    void BeginEvent(Player* pPlayer);
     void PatientDied(Location* Point);
-    void PatientSaved(Creature* soldier, Player* player, Location* Point);
+    void PatientSaved(Creature* soldier, Player* pPlayer, Location* Point);
     void UpdateAI(const uint32 diff);
 
     void EnterCombat(Unit* who){}
@@ -569,11 +569,11 @@ struct TRINITY_DLL_DECL npc_injured_patientAI : public ScriptedAI
     {
         if (caster->GetTypeId() == TYPEID_PLAYER && m_creature->isAlive() && spell->Id == 20804)
         {
-            if((CAST_PLR(caster)->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (CAST_PLR(caster)->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE))
+            if ((CAST_PLR(caster)->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (CAST_PLR(caster)->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE))
             {
                 if (Doctorguid)
                 {
-                    if(Creature* Doctor = Unit::GetCreature(*m_creature, Doctorguid))
+                    if (Creature* Doctor = Unit::GetCreature(*m_creature, Doctorguid))
                         CAST_AI(npc_doctorAI, Doctor->AI())->PatientSaved(m_creature, CAST_PLR(caster), Coord);
                 }
             }
@@ -618,7 +618,7 @@ struct TRINITY_DLL_DECL npc_injured_patientAI : public ScriptedAI
         //lower HP on every world tick makes it a useful counter, not officlone though
         if (m_creature->isAlive() && m_creature->GetHealth() > 6)
         {
-            m_creature->SetHealth(uint32(m_creature->GetHealth()-5) );
+            m_creature->SetHealth(uint32(m_creature->GetHealth()-5));
         }
 
         if (m_creature->isAlive() && m_creature->GetHealth() <= 6)
@@ -630,7 +630,7 @@ struct TRINITY_DLL_DECL npc_injured_patientAI : public ScriptedAI
 
             if (Doctorguid)
             {
-                if(Creature* Doctor = Unit::GetCreature((*m_creature), Doctorguid))
+                if (Creature* Doctor = Unit::GetCreature((*m_creature), Doctorguid))
                     CAST_AI(npc_doctorAI, Doctor->AI())->PatientDied(Coord);
             }
         }
@@ -646,9 +646,9 @@ CreatureAI* GetAI_npc_injured_patient(Creature *_Creature)
 npc_doctor (continue)
 */
 
-void npc_doctorAI::BeginEvent(Player* player)
+void npc_doctorAI::BeginEvent(Player* pPlayer)
 {
-    Playerguid = player->GetGUID();
+    PlayerGUID = pPlayer->GetGUID();
 
     SummonPatient_Timer = 10000;
     SummonPatientCount = 0;
@@ -673,17 +673,17 @@ void npc_doctorAI::BeginEvent(Player* player)
 
 void npc_doctorAI::PatientDied(Location* Point)
 {
-    Player* player = Unit::GetPlayer(Playerguid);
-    if(player && ((player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)))
+    Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+    if (pPlayer && ((pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)))
     {
         ++PatientDiedCount;
 
         if (PatientDiedCount > 5 && Event)
         {
-            if(player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE)
-                player->FailQuest(6624);
-            else if(player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)
-                player->FailQuest(6622);
+            if (pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE)
+                pPlayer->FailQuest(6624);
+            else if (pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)
+                pPlayer->FailQuest(6622);
 
             Reset();
             return;
@@ -696,11 +696,11 @@ void npc_doctorAI::PatientDied(Location* Point)
         Reset();
 }
 
-void npc_doctorAI::PatientSaved(Creature* soldier, Player* player, Location* Point)
+void npc_doctorAI::PatientSaved(Creature* soldier, Player* pPlayer, Location* Point)
 {
-    if (player && Playerguid == player->GetGUID())
+    if (pPlayer && PlayerGUID == pPlayer->GetGUID())
     {
-        if ((player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE))
+        if ((pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE))
         {
             ++PatientSavedCount;
 
@@ -711,15 +711,15 @@ void npc_doctorAI::PatientSaved(Creature* soldier, Player* player, Location* Poi
                     std::list<uint64>::iterator itr;
                     for(itr = Patients.begin(); itr != Patients.end(); ++itr)
                     {
-                        if(Creature* Patient = Unit::GetCreature((*m_creature), *itr))
+                        if (Creature* Patient = Unit::GetCreature((*m_creature), *itr))
                             Patient->setDeathState(JUST_DIED);
                     }
                 }
 
-                if (player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE)
-                    player->AreaExploredOrEventHappens(6624);
-                else if (player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)
-                    player->AreaExploredOrEventHappens(6622);
+                if (pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE)
+                    pPlayer->AreaExploredOrEventHappens(6624);
+                else if (pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)
+                    pPlayer->AreaExploredOrEventHappens(6622);
 
                 Reset();
                 return;
@@ -783,10 +783,10 @@ void npc_doctorAI::UpdateAI(const uint32 diff)
     }
 }
 
-bool QuestAccept_npc_doctor(Player *player, Creature *creature, Quest const *quest )
+bool QuestAccept_npc_doctor(Player* pPlayer, Creature *creature, Quest const *quest)
 {
     if ((quest->GetQuestId() == 6624) || (quest->GetQuestId() == 6622))
-        CAST_AI(npc_doctorAI, creature->AI())->BeginEvent(player);
+        CAST_AI(npc_doctorAI, creature->AI())->BeginEvent(pPlayer);
 
     return true;
 }
@@ -1091,15 +1091,15 @@ bool GossipSelect_npc_kingdom_of_dalaran_quests(Player* pPlayer, Creature* pCrea
 ## npc_mount_vendor
 ######*/
 
-bool GossipHello_npc_mount_vendor(Player *player, Creature *_Creature)
+bool GossipHello_npc_mount_vendor(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
     bool canBuy;
     canBuy = false;
     uint32 vendor = _Creature->GetEntry();
-    uint8 race = player->getRace();
+    uint8 race = pPlayer->getRace();
 
     switch (vendor)
     {
@@ -1107,53 +1107,53 @@ bool GossipHello_npc_mount_vendor(Player *player, Creature *_Creature)
         case 1460:                                          //Unger Statforth
         case 2357:                                          //Merideth Carlson
         case 4885:                                          //Gregor MacVince
-            if (player->GetReputationRank(72) != REP_EXALTED && race != RACE_HUMAN)
-                player->SEND_GOSSIP_MENU(5855, _Creature->GetGUID());
+            if (pPlayer->GetReputationRank(72) != REP_EXALTED && race != RACE_HUMAN)
+                pPlayer->SEND_GOSSIP_MENU(5855, _Creature->GetGUID());
             else canBuy = true;
             break;
         case 1261:                                          //Veron Amberstill
-            if (player->GetReputationRank(47) != REP_EXALTED && race != RACE_DWARF)
-                player->SEND_GOSSIP_MENU(5856, _Creature->GetGUID());
+            if (pPlayer->GetReputationRank(47) != REP_EXALTED && race != RACE_DWARF)
+                pPlayer->SEND_GOSSIP_MENU(5856, _Creature->GetGUID());
             else canBuy = true;
             break;
         case 3362:                                          //Ogunaro Wolfrunner
-            if (player->GetReputationRank(76) != REP_EXALTED && race != RACE_ORC)
-                player->SEND_GOSSIP_MENU(5841, _Creature->GetGUID());
+            if (pPlayer->GetReputationRank(76) != REP_EXALTED && race != RACE_ORC)
+                pPlayer->SEND_GOSSIP_MENU(5841, _Creature->GetGUID());
             else canBuy = true;
             break;
         case 3685:                                          //Harb Clawhoof
-            if (player->GetReputationRank(81) != REP_EXALTED && race != RACE_TAUREN)
-                player->SEND_GOSSIP_MENU(5843, _Creature->GetGUID());
+            if (pPlayer->GetReputationRank(81) != REP_EXALTED && race != RACE_TAUREN)
+                pPlayer->SEND_GOSSIP_MENU(5843, _Creature->GetGUID());
             else canBuy = true;
             break;
         case 4730:                                          //Lelanai
-            if (player->GetReputationRank(69) != REP_EXALTED && race != RACE_NIGHTELF)
-                player->SEND_GOSSIP_MENU(5844, _Creature->GetGUID());
+            if (pPlayer->GetReputationRank(69) != REP_EXALTED && race != RACE_NIGHTELF)
+                pPlayer->SEND_GOSSIP_MENU(5844, _Creature->GetGUID());
             else canBuy = true;
             break;
         case 4731:                                          //Zachariah Post
-            if (player->GetReputationRank(68) != REP_EXALTED && race != RACE_UNDEAD_PLAYER)
-                player->SEND_GOSSIP_MENU(5840, _Creature->GetGUID());
+            if (pPlayer->GetReputationRank(68) != REP_EXALTED && race != RACE_UNDEAD_PLAYER)
+                pPlayer->SEND_GOSSIP_MENU(5840, _Creature->GetGUID());
             else canBuy = true;
             break;
         case 7952:                                          //Zjolnir
-            if (player->GetReputationRank(530) != REP_EXALTED && race != RACE_TROLL)
-                player->SEND_GOSSIP_MENU(5842, _Creature->GetGUID());
+            if (pPlayer->GetReputationRank(530) != REP_EXALTED && race != RACE_TROLL)
+                pPlayer->SEND_GOSSIP_MENU(5842, _Creature->GetGUID());
             else canBuy = true;
             break;
         case 7955:                                          //Milli Featherwhistle
-            if (player->GetReputationRank(54) != REP_EXALTED && race != RACE_GNOME)
-                player->SEND_GOSSIP_MENU(5857, _Creature->GetGUID());
+            if (pPlayer->GetReputationRank(54) != REP_EXALTED && race != RACE_GNOME)
+                pPlayer->SEND_GOSSIP_MENU(5857, _Creature->GetGUID());
             else canBuy = true;
             break;
         case 16264:                                         //Winaestra
-            if (player->GetReputationRank(911) != REP_EXALTED && race != RACE_BLOODELF)
-                player->SEND_GOSSIP_MENU(10305, _Creature->GetGUID());
+            if (pPlayer->GetReputationRank(911) != REP_EXALTED && race != RACE_BLOODELF)
+                pPlayer->SEND_GOSSIP_MENU(10305, _Creature->GetGUID());
             else canBuy = true;
             break;
         case 17584:                                         //Torallius the Pack Handler
-            if (player->GetReputationRank(930) != REP_EXALTED && race != RACE_DRAENEI)
-                player->SEND_GOSSIP_MENU(10239, _Creature->GetGUID());
+            if (pPlayer->GetReputationRank(930) != REP_EXALTED && race != RACE_DRAENEI)
+                pPlayer->SEND_GOSSIP_MENU(10239, _Creature->GetGUID());
             else canBuy = true;
             break;
     }
@@ -1161,16 +1161,16 @@ bool GossipHello_npc_mount_vendor(Player *player, Creature *_Creature)
     if (canBuy)
     {
         if (_Creature->isVendor())
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
-        player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+        pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     }
     return true;
 }
 
-bool GossipSelect_npc_mount_vendor(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_mount_vendor(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_TRADE)
-        player->SEND_VENDORLIST( _Creature->GetGUID() );
+        pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
 
     return true;
 }
@@ -1179,41 +1179,41 @@ bool GossipSelect_npc_mount_vendor(Player *player, Creature *_Creature, uint32 s
 ## npc_rogue_trainer
 ######*/
 
-bool GossipHello_npc_rogue_trainer(Player *player, Creature *_Creature)
+bool GossipHello_npc_rogue_trainer(Player* pPlayer, Creature *_Creature)
 {
-    if( _Creature->isQuestGiver() )
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( _Creature->isTrainer() )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
+    if (_Creature->isTrainer())
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
 
-    if( _Creature->isCanTrainingAndResetTalentsOf(player) )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "I wish to unlearn my talents", GOSSIP_SENDER_MAIN, GOSSIP_OPTION_UNLEARNTALENTS);
+    if (_Creature->isCanTrainingAndResetTalentsOf(pPlayer))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "I wish to unlearn my talents", GOSSIP_SENDER_MAIN, GOSSIP_OPTION_UNLEARNTALENTS);
 
-    if( player->getClass() == CLASS_ROGUE && player->getLevel() >= 24 && !player->HasItemCount(17126,1) && !player->GetQuestRewardStatus(6681) )
+    if (pPlayer->getClass() == CLASS_ROGUE && pPlayer->getLevel() >= 24 && !pPlayer->HasItemCount(17126,1) && !pPlayer->GetQuestRewardStatus(6681))
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "<Take the letter>", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->SEND_GOSSIP_MENU(5996, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "<Take the letter>", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->SEND_GOSSIP_MENU(5996, _Creature->GetGUID());
     } else
-        player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_rogue_trainer(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    switch( action )
+    switch(action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->CLOSE_GOSSIP_MENU();
-            player->CastSpell(player,21100,false);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->CastSpell(pPlayer,21100,false);
             break;
         case GOSSIP_ACTION_TRAIN:
-            player->SEND_TRAINERLIST( _Creature->GetGUID() );
+            pPlayer->SEND_TRAINERLIST(_Creature->GetGUID());
             break;
         case GOSSIP_OPTION_UNLEARNTALENTS:
-            player->CLOSE_GOSSIP_MENU();
-            player->SendTalentWipeConfirm( _Creature->GetGUID() );
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->SendTalentWipeConfirm(_Creature->GetGUID());
             break;
     }
     return true;
@@ -1233,121 +1233,121 @@ bool GossipSelect_npc_rogue_trainer(Player *player, Creature *_Creature, uint32
 #define SPELL_AGI       23736                               //agi
 #define SPELL_FORTUNE   23765                               //faire fortune
 
-bool GossipHello_npc_sayge(Player *player, Creature *_Creature)
+bool GossipHello_npc_sayge(Player* pPlayer, Creature *_Creature)
 {
-    if(_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
-
-    if( player->HasSpellCooldown(SPELL_INT) ||
-        player->HasSpellCooldown(SPELL_ARM) ||
-        player->HasSpellCooldown(SPELL_DMG) ||
-        player->HasSpellCooldown(SPELL_RES) ||
-        player->HasSpellCooldown(SPELL_STR) ||
-        player->HasSpellCooldown(SPELL_AGI) ||
-        player->HasSpellCooldown(SPELL_STM) ||
-        player->HasSpellCooldown(SPELL_SPI) )
-        player->SEND_GOSSIP_MENU(7393, _Creature->GetGUID());
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
+
+    if (pPlayer->HasSpellCooldown(SPELL_INT) ||
+        pPlayer->HasSpellCooldown(SPELL_ARM) ||
+        pPlayer->HasSpellCooldown(SPELL_DMG) ||
+        pPlayer->HasSpellCooldown(SPELL_RES) ||
+        pPlayer->HasSpellCooldown(SPELL_STR) ||
+        pPlayer->HasSpellCooldown(SPELL_AGI) ||
+        pPlayer->HasSpellCooldown(SPELL_STM) ||
+        pPlayer->HasSpellCooldown(SPELL_SPI))
+        pPlayer->SEND_GOSSIP_MENU(7393, _Creature->GetGUID());
     else
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->SEND_GOSSIP_MENU(7339, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->SEND_GOSSIP_MENU(7339, _Creature->GetGUID());
     }
 
     return true;
 }
 
-void SendAction_npc_sayge(Player *player, Creature *_Creature, uint32 action)
+void SendAction_npc_sayge(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     switch(action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Slay the Man",                      GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Turn him over to liege",            GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Confiscate the corn",               GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let him go and have the corn",      GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-            player->SEND_GOSSIP_MENU(7340, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Slay the Man",                      GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Turn him over to liege",            GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Confiscate the corn",               GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let him go and have the corn",      GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            pPlayer->SEND_GOSSIP_MENU(7340, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Execute your friend painfully",     GOSSIP_SENDER_MAIN+1, GOSSIP_ACTION_INFO_DEF);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Execute your friend painlessly",    GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let your friend go",                GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF);
-            player->SEND_GOSSIP_MENU(7341, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Execute your friend painfully",     GOSSIP_SENDER_MAIN+1, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Execute your friend painlessly",    GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let your friend go",                GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->SEND_GOSSIP_MENU(7341, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Confront the diplomat",             GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Show not so quiet defiance",        GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Remain quiet",                      GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF);
-            player->SEND_GOSSIP_MENU(7361, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Confront the diplomat",             GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Show not so quiet defiance",        GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Remain quiet",                      GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->SEND_GOSSIP_MENU(7361, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Speak against your brother openly", GOSSIP_SENDER_MAIN+6, GOSSIP_ACTION_INFO_DEF);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Help your brother in",              GOSSIP_SENDER_MAIN+7, GOSSIP_ACTION_INFO_DEF);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Keep your brother out without letting him know", GOSSIP_SENDER_MAIN+8, GOSSIP_ACTION_INFO_DEF);
-            player->SEND_GOSSIP_MENU(7362, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Speak against your brother openly", GOSSIP_SENDER_MAIN+6, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Help your brother in",              GOSSIP_SENDER_MAIN+7, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Keep your brother out without letting him know", GOSSIP_SENDER_MAIN+8, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->SEND_GOSSIP_MENU(7362, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Take credit, keep gold",            GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Take credit, share the gold",       GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF);
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let the knight take credit",        GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF);
-            player->SEND_GOSSIP_MENU(7363, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Take credit, keep gold",            GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Take credit, share the gold",       GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let the knight take credit",        GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF);
+            pPlayer->SEND_GOSSIP_MENU(7363, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thanks",                            GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
-            player->SEND_GOSSIP_MENU(7364, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thanks",                            GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
+            pPlayer->SEND_GOSSIP_MENU(7364, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+6:
-            _Creature->CastSpell(player, SPELL_FORTUNE, false);
-            player->SEND_GOSSIP_MENU(7365, _Creature->GetGUID());
+            _Creature->CastSpell(pPlayer, SPELL_FORTUNE, false);
+            pPlayer->SEND_GOSSIP_MENU(7365, _Creature->GetGUID());
             break;
     }
 }
 
-bool GossipSelect_npc_sayge(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_sayge(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch(sender)
     {
         case GOSSIP_SENDER_MAIN:
-            SendAction_npc_sayge(player, _Creature, action);
+            SendAction_npc_sayge(pPlayer, _Creature, action);
             break;
         case GOSSIP_SENDER_MAIN+1:
-            _Creature->CastSpell(player, SPELL_DMG, false);
-            player->AddSpellCooldown(SPELL_DMG,0,time(NULL) + 7200);
-            SendAction_npc_sayge(player, _Creature, action);
+            _Creature->CastSpell(pPlayer, SPELL_DMG, false);
+            pPlayer->AddSpellCooldown(SPELL_DMG,0,time(NULL) + 7200);
+            SendAction_npc_sayge(pPlayer, _Creature, action);
             break;
         case GOSSIP_SENDER_MAIN+2:
-            _Creature->CastSpell(player, SPELL_RES, false);
-            player->AddSpellCooldown(SPELL_RES,0,time(NULL) + 7200);
-            SendAction_npc_sayge(player, _Creature, action);
+            _Creature->CastSpell(pPlayer, SPELL_RES, false);
+            pPlayer->AddSpellCooldown(SPELL_RES,0,time(NULL) + 7200);
+            SendAction_npc_sayge(pPlayer, _Creature, action);
             break;
         case GOSSIP_SENDER_MAIN+3:
-            _Creature->CastSpell(player, SPELL_ARM, false);
-            player->AddSpellCooldown(SPELL_ARM,0,time(NULL) + 7200);
-            SendAction_npc_sayge(player, _Creature, action);
+            _Creature->CastSpell(pPlayer, SPELL_ARM, false);
+            pPlayer->AddSpellCooldown(SPELL_ARM,0,time(NULL) + 7200);
+            SendAction_npc_sayge(pPlayer, _Creature, action);
             break;
         case GOSSIP_SENDER_MAIN+4:
-            _Creature->CastSpell(player, SPELL_SPI, false);
-            player->AddSpellCooldown(SPELL_SPI,0,time(NULL) + 7200);
-            SendAction_npc_sayge(player, _Creature, action);
+            _Creature->CastSpell(pPlayer, SPELL_SPI, false);
+            pPlayer->AddSpellCooldown(SPELL_SPI,0,time(NULL) + 7200);
+            SendAction_npc_sayge(pPlayer, _Creature, action);
             break;
         case GOSSIP_SENDER_MAIN+5:
-            _Creature->CastSpell(player, SPELL_INT, false);
-            player->AddSpellCooldown(SPELL_INT,0,time(NULL) + 7200);
-            SendAction_npc_sayge(player, _Creature, action);
+            _Creature->CastSpell(pPlayer, SPELL_INT, false);
+            pPlayer->AddSpellCooldown(SPELL_INT,0,time(NULL) + 7200);
+            SendAction_npc_sayge(pPlayer, _Creature, action);
             break;
         case GOSSIP_SENDER_MAIN+6:
-            _Creature->CastSpell(player, SPELL_STM, false);
-            player->AddSpellCooldown(SPELL_STM,0,time(NULL) + 7200);
-            SendAction_npc_sayge(player, _Creature, action);
+            _Creature->CastSpell(pPlayer, SPELL_STM, false);
+            pPlayer->AddSpellCooldown(SPELL_STM,0,time(NULL) + 7200);
+            SendAction_npc_sayge(pPlayer, _Creature, action);
             break;
         case GOSSIP_SENDER_MAIN+7:
-            _Creature->CastSpell(player, SPELL_STR, false);
-            player->AddSpellCooldown(SPELL_STR,0,time(NULL) + 7200);
-            SendAction_npc_sayge(player, _Creature, action);
+            _Creature->CastSpell(pPlayer, SPELL_STR, false);
+            pPlayer->AddSpellCooldown(SPELL_STR,0,time(NULL) + 7200);
+            SendAction_npc_sayge(pPlayer, _Creature, action);
             break;
         case GOSSIP_SENDER_MAIN+8:
-            _Creature->CastSpell(player, SPELL_AGI, false);
-            player->AddSpellCooldown(SPELL_AGI,0,time(NULL) + 7200);
-            SendAction_npc_sayge(player, _Creature, action);
+            _Creature->CastSpell(pPlayer, SPELL_AGI, false);
+            pPlayer->AddSpellCooldown(SPELL_AGI,0,time(NULL) + 7200);
+            SendAction_npc_sayge(pPlayer, _Creature, action);
             break;
     }
     return true;
@@ -1421,21 +1421,21 @@ CreatureAI* GetAI_npc_tonk_mine(Creature *_Creature)
 ## npc_winter_reveler
 ####*/
 
-bool ReceiveEmote_npc_winter_reveler( Player *player, Creature *_Creature, uint32 emote )
+bool ReceiveEmote_npc_winter_reveler(Player* pPlayer, Creature *_Creature, uint32 emote)
 {
     //TODO: check auralist.
-    if(player->HasAura(26218))
+    if (pPlayer->HasAura(26218))
         return false;
 
-    if( emote == TEXTEMOTE_KISS )
+    if (emote == TEXTEMOTE_KISS)
     {
         _Creature->CastSpell(_Creature, 26218, false);
-        player->CastSpell(player, 26218, false);
+        pPlayer->CastSpell(pPlayer, 26218, false);
         switch(rand()%3)
         {
-        case 0: _Creature->CastSpell(player, 26207, false); break;
-        case 1: _Creature->CastSpell(player, 26206, false); break;
-        case 2: _Creature->CastSpell(player, 45036, false); break;
+        case 0: _Creature->CastSpell(pPlayer, 26207, false); break;
+        case 1: _Creature->CastSpell(pPlayer, 26206, false); break;
+        case 2: _Creature->CastSpell(pPlayer, 45036, false); break;
         }
     }
     return true;
@@ -1445,10 +1445,10 @@ bool ReceiveEmote_npc_winter_reveler( Player *player, Creature *_Creature, uint3
 ## npc_brewfest_reveler
 ####*/
 
-bool ReceiveEmote_npc_brewfest_reveler( Player *player, Creature *_Creature, uint32 emote )
+bool ReceiveEmote_npc_brewfest_reveler(Player* pPlayer, Creature *_Creature, uint32 emote)
 {
-    if( emote == TEXTEMOTE_DANCE )
-        _Creature->CastSpell(player, 41586, false);
+    if (emote == TEXTEMOTE_DANCE)
+        _Creature->CastSpell(pPlayer, 41586, false);
 
     return true;
 }
@@ -1485,7 +1485,7 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI
 
         CreatureInfo const *Info = m_creature->GetCreatureInfo();
 
-        if(Info->Entry == C_VIPER)
+        if (Info->Entry == C_VIPER)
             IsViper = true;
         else
             IsViper = false;
@@ -1505,15 +1505,15 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI
     //Redefined for random target selection:
     void MoveInLineOfSight(Unit *who)
     {
-        if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature))
+        if (!m_creature->getVictim() && who->isTargetableForAttack() && (m_creature->IsHostileTo(who)) && who->isInAccessiblePlaceFor(m_creature))
         {
             if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
                 return;
 
             float attackRadius = m_creature->GetAttackDistance(who);
-            if( m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who) )
+            if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who))
             {
-                if (!(rand() % RAND) )
+                if (!(rand() % RAND))
                 {
                     m_creature->setAttackTimer(BASE_ATTACK, (rand() % 10) * 100);
                     SpellTimer = (rand() % 10) * 100;
@@ -1525,13 +1525,13 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(Spawn)
+        if (Spawn)
         {
             Spawn = false;
             // Start attacking attacker of owner on first ai update after spawn - move in line of sight may choose better target
             if (!m_creature->getVictim() && m_creature->isSummon())
                 if (Unit * Owner = CAST_SUM(m_creature)->GetSummoner())
-                    if(Owner->getAttackerForHelper())
+                    if (Owner->getAttackerForHelper())
                         AttackStart(Owner->getAttackerForHelper());
         }
 
@@ -1549,7 +1549,7 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI
                 if (rand() % 3 == 0) //33% chance to cast
                 {
                     uint32 spell;
-                    if( rand() % 2 == 0)
+                    if (rand() % 2 == 0)
                         spell = SPELL_MIND_NUMBING_POISON;
                     else
                         spell = SPELL_CRIPPLING_POISON;
@@ -1591,20 +1591,20 @@ struct TRINITY_DLL_DECL mob_mojoAI : public ScriptedAI
     void Aggro(Unit *who){}
     void UpdateAI(const uint32 diff)
     {
-        if(m_creature->HasAura(20372,0))
+        if (m_creature->HasAura(20372,0))
         {
-            if(hearts<diff)
+            if (hearts<diff)
             {
                 m_creature->RemoveAurasDueToSpell(20372);
                 hearts = 15000;
             }hearts-=diff;
         }
     }
-    void ReceiveEmote(Player *player, uint32 emote)
+    void ReceiveEmote(Player* pPlayer, uint32 emote)
     {
         m_creature->HandleEmoteCommand(emote);
         Unit* own = m_creature->GetOwner();
-        if (!own || own->GetTypeId() != TYPEID_PLAYER || CAST_PLR(own)->GetTeam() != player->GetTeam())
+        if (!own || own->GetTypeId() != TYPEID_PLAYER || CAST_PLR(own)->GetTeam() != pPlayer->GetTeam())
             return;
         if (emote == TEXTEMOTE_KISS)
         {
@@ -1619,22 +1619,22 @@ struct TRINITY_DLL_DECL mob_mojoAI : public ScriptedAI
                 case 5:whisp.append("Feelin' a little froggy, are ya?");break;
                 case 6:
                     whisp.append("Listen, ");
-                    whisp.append(player->GetName());
+                    whisp.append(pPlayer->GetName());
                     whisp.append(", I know of a little swamp not too far from here....");
                     break;
                 case 7:whisp.append("There's just never enough Mojo to go around...");break;
             }
-            m_creature->MonsterWhisper(whisp.c_str(),player->GetGUID());
-            if(victimGUID)
+            m_creature->MonsterWhisper(whisp.c_str(),pPlayer->GetGUID());
+            if (victimGUID)
             {
                 Player* victim = Unit::GetPlayer(victimGUID);
-                if(victim)
+                if (victim)
                     victim->RemoveAura(43906);//remove polymorph frog thing
             }
-            m_creature->AddAura(43906,player);//add polymorph frog thing
-            victimGUID = player->GetGUID();            
+            m_creature->AddAura(43906,pPlayer);//add polymorph frog thing
+            victimGUID = pPlayer->GetGUID();            
             m_creature->CastSpell(m_creature,20372,true);//tag.hearts
-            m_creature->GetMotionMaster()->MoveFollow(player,0,0);
+            m_creature->GetMotionMaster()->MoveFollow(pPlayer,0,0);
             hearts = 15000;
         }   
     }
@@ -1666,13 +1666,13 @@ struct TRINITY_DLL_DECL npc_mirror_image : SpellCasterAI
     // Do not reload creature templates on evade mode enter - prevent visual lost
     void EnterEvadeMode()
     {
-        if(me->IsInEvadeMode() || !me->isAlive())
+        if (me->IsInEvadeMode() || !me->isAlive())
             return;
 
         Unit *owner = me->GetCharmerOrOwner();
 
         me->CombatStop(true);
-        if(owner && !me->hasUnitState(UNIT_STAT_FOLLOW) )
+        if (owner && !me->hasUnitState(UNIT_STAT_FOLLOW))
         {
             me->GetMotionMaster()->Clear(false);
             me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, m_creature->GetFollowAngle(), MOTION_SLOT_ACTIVE);
@@ -1701,12 +1701,12 @@ struct TRINITY_DLL_DECL npc_lightwellAI : public PassiveAI
     /*
     void UpdateAI(const uint32 diff)
     {
-        if(desummon_timer < diff)
+        if (desummon_timer < diff)
         {
             m_creature->Kill(m_creature);
         }else desummon_timer -= diff;
 
-        if(!m_creature->HasAura(59907))
+        if (!m_creature->HasAura(59907))
         {
             m_creature->Kill(m_creature);
         }
@@ -1742,11 +1742,11 @@ struct TRINITY_DLL_DECL npc_training_dummy : Scripted_NoMovementAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
-        if(!m_creature->hasUnitState(UNIT_STAT_STUNNED))
+        if (!m_creature->hasUnitState(UNIT_STAT_STUNNED))
             m_creature->SetControlled(true,UNIT_STAT_STUNNED);//disable rotate
-        if(ResetTimer <= diff)
+        if (ResetTimer <= diff)
         {
             EnterEvadeMode();
             ResetTimer = 10000;
diff --git a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp
index a91742b083c..93e3c90a22e 100644
--- a/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp
+++ b/src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp
@@ -54,12 +54,12 @@ struct TRINITY_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
         switch(i)
         {
-        case 4:DoScriptText(SAY_PROGRESS_2, m_creature, player);break;
-        case 5:DoScriptText(SAY_PROGRESS_3, m_creature, player);break;
+        case 4:DoScriptText(SAY_PROGRESS_2, m_creature, pPlayer);break;
+        case 5:DoScriptText(SAY_PROGRESS_3, m_creature, pPlayer);break;
         case 8:DoScriptText(EMOTE_PROGRESS_4, m_creature);break;
         case 9:
             {
@@ -67,15 +67,15 @@ struct TRINITY_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI
             m_creature->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96, -2142.49, 20.15, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
             break;
             }
-        case 10:DoScriptText(SAY_PROGRESS_5, m_creature, player);break;
-        case 11:DoScriptText(SAY_PROGRESS_6, m_creature, player);break;
-        case 19:DoScriptText(SAY_PROGRESS_7, m_creature, player); break;
+        case 10:DoScriptText(SAY_PROGRESS_5, m_creature, pPlayer);break;
+        case 11:DoScriptText(SAY_PROGRESS_6, m_creature, pPlayer);break;
+        case 19:DoScriptText(SAY_PROGRESS_7, m_creature, pPlayer); break;
         case 20:
             DoScriptText(EMOTE_PROGRESS_8, m_creature);
-            DoScriptText(SAY_PROGRESS_9, m_creature, player);
+            DoScriptText(SAY_PROGRESS_9, m_creature, pPlayer);
             Completed = true;
-            if(player)
-                CAST_PLR(player)->GroupEventHappens(QUEST_SUNKEN_TREASURE, m_creature);
+            if (pPlayer)
+                CAST_PLR(pPlayer)->GroupEventHappens(QUEST_SUNKEN_TREASURE, m_creature);
             break;
         }
     }
@@ -98,11 +98,11 @@ struct TRINITY_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI
 
     void JustDied(Unit* killer)
     {
-        if (PlayerGUID && !Completed )
+        if (PlayerGUID && !Completed)
         {
-            Player* player = Unit::GetPlayer(PlayerGUID);
-            if (player)
-                CAST_PLR(player)->FailQuest(QUEST_SUNKEN_TREASURE);
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (pPlayer)
+                CAST_PLR(pPlayer)->FailQuest(QUEST_SUNKEN_TREASURE);
         }
     }
 
@@ -112,12 +112,12 @@ struct TRINITY_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI
     }
 };
 
-bool QuestAccept_npc_professor_phizzlethorpe(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_professor_phizzlethorpe(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_SUNKEN_TREASURE)
     {
-        DoScriptText(SAY_PROGRESS_1, creature, player);
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, player->GetGUID());
+        DoScriptText(SAY_PROGRESS_1, creature, pPlayer);
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, pPlayer->GetGUID());
         creature->setFaction(113);
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp
index 9c8ee5a7db2..5ae9a4487bd 100644
--- a/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp
+++ b/src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp
@@ -59,18 +59,18 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!player)
+        if (!pPlayer)
             return;
 
         switch (i)
         {
         case 1:
-            DoScriptText(SAY_MOVE, m_creature, player);
+            DoScriptText(SAY_MOVE, m_creature, pPlayer);
             break;
         case 8:
-            DoScriptText(SAY_PREPARE, m_creature, player);
+            DoScriptText(SAY_PREPARE, m_creature, pPlayer);
             break;
         case 19:
             //TODO: verify location and creatures amount.
@@ -79,13 +79,13 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI
             m_creature->SummonCreature(ENTRY_SILVERWING_WARRIOR,1778.73,-2049.50,109.83,1.67,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000);
             break;
         case 20:
-            DoScriptText(SAY_WIN, m_creature, player);
+            DoScriptText(SAY_WIN, m_creature, pPlayer);
             Completed = true;
-            if (player && player->GetTypeId() == TYPEID_PLAYER)
-                CAST_PLR(player)->GroupEventHappens(QUEST_TOREK_ASSULT,m_creature);
+            if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)
+                CAST_PLR(pPlayer)->GroupEventHappens(QUEST_TOREK_ASSULT,m_creature);
             break;
         case 21:
-            DoScriptText(SAY_END, m_creature, player);
+            DoScriptText(SAY_END, m_creature, pPlayer);
             break;
         }
     }
@@ -113,8 +113,8 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI
 
         if (PlayerGUID && !Completed)
         {
-            if (Player* player = Unit::GetPlayer(PlayerGUID))
-                CAST_PLR(player)->FailQuest(QUEST_TOREK_ASSULT);
+            if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
+                CAST_PLR(pPlayer)->FailQuest(QUEST_TOREK_ASSULT);
         }
     }
 
@@ -139,13 +139,13 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI
     }
 };
 
-bool QuestAccept_npc_torek(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_torek(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_TOREK_ASSULT)
     {
         //TODO: find companions, make them follow Torek, at any time (possibly done by mangos/database in future?)
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, true, player->GetGUID());
-        DoScriptText(SAY_READY, creature, player);
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, true, pPlayer->GetGUID());
+        DoScriptText(SAY_READY, creature, pPlayer);
         creature->setFaction(113);
     }
 
@@ -174,9 +174,9 @@ struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!player)
+        if (!pPlayer)
             return;
 
         switch(i)
@@ -184,7 +184,7 @@ struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI
         case 0:    {
                 m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
                 GameObject* Cage = m_creature->FindNearestGameObject(GO_CAGE, 20);
-                if(Cage)
+                if (Cage)
                     Cage->SetGoState(GO_STATE_ACTIVE);
                 break;}
         case 13:
@@ -199,8 +199,8 @@ struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI
                 break;
 
         case 21:{
-                if (player && player->GetTypeId() == TYPEID_PLAYER)
-                    CAST_PLR(player)->GroupEventHappens(QUEST_FREEDOM_TO_RUUL,m_creature);
+                if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)
+                    CAST_PLR(pPlayer)->GroupEventHappens(QUEST_FREEDOM_TO_RUUL,m_creature);
 
                 break;  }
         }
@@ -214,7 +214,7 @@ struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI
             m_creature->setFaction(1602);
 
         GameObject* Cage = m_creature->FindNearestGameObject(GO_CAGE, 20);
-        if(Cage)
+        if (Cage)
             Cage->SetGoState(GO_STATE_READY);
     }
 
@@ -227,9 +227,9 @@ struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI
     {
         if (PlayerGUID)
         {
-            Player* player = Unit::GetPlayer(PlayerGUID);
-            if (player)
-                CAST_PLR(player)->FailQuest(QUEST_FREEDOM_TO_RUUL);
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (pPlayer)
+                CAST_PLR(pPlayer)->FailQuest(QUEST_FREEDOM_TO_RUUL);
         }
     }
 
@@ -239,12 +239,12 @@ struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI
     }
 };
 
-bool QuestAccept_npc_ruul_snowhoof(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_ruul_snowhoof(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_FREEDOM_TO_RUUL)
     {
         creature->setFaction(113);
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
index 16333c58c15..fb47de3bb20 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
@@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI
             summoned->SetLevel(m_creature->getLevel());
             summoned->addUnitState(UNIT_STAT_ROOT);
 
-            if(focusedTarget)
+            if (focusedTarget)
                 summoned->AI()->AttackStart(focusedTarget);
         }
     }
@@ -82,26 +82,26 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI
         if (Inhibitmagic_Timer < diff)
         {
             float dist;
-            Map *map = m_creature->GetMap();
-            Map::PlayerList const &PlayerList = map->GetPlayers();
+            Map* pMap = m_creature->GetMap();
+            Map::PlayerList const &PlayerList = pMap->GetPlayers();
             for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
                 if (Player* i_pl = i->getSource())
                     if (i_pl->isAlive() && (dist = i_pl->IsWithinDist(m_creature, 45)))
                     {
                         i_pl->RemoveAurasDueToSpell(SPELL_INHIBITMAGIC);
                         m_creature->AddAura(SPELL_INHIBITMAGIC, i_pl);
-                        if(dist < 35)
+                        if (dist < 35)
                             m_creature->AddAura(SPELL_INHIBITMAGIC, i_pl);
-                        if(dist < 25)
+                        if (dist < 25)
                             m_creature->AddAura(SPELL_INHIBITMAGIC, i_pl);
-                        if(dist < 15)
+                        if (dist < 15)
                             m_creature->AddAura(SPELL_INHIBITMAGIC, i_pl);
                     }
             Inhibitmagic_Timer = 3000+(rand()%1000);
         }else Inhibitmagic_Timer -= diff;
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Attractmagic_Timer
@@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //FieryBlast_Timer
@@ -179,8 +179,8 @@ struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI
         {
             DoCast(m_creature,SPELL_FIERY_BLAST);
 
-            if(fiery1) fiery1 = false;
-            else if(fiery2) fiery2 = false;
+            if (fiery1) fiery1 = false;
+            else if (fiery2) fiery2 = false;
 
             FieryBlast_Timer = 1000;
         }else FieryBlast_Timer -= diff;
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
index 17c04fc28c2..a434950acc1 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
+++ b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
@@ -117,11 +117,11 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI
 
     void JustSummoned(Creature *summoned)
     {
-        if( summoned->GetEntry() == NPC_BEACON )
+        if (summoned->GetEntry() == NPC_BEACON)
         {
             summoned->CastSpell(summoned,SPELL_ETHEREAL_BEACON_VISUAL,false);
 
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 summoned->AI()->AttackStart(target);
         }
 
@@ -153,9 +153,9 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if( FrostNova_Timer < diff )
+        if (FrostNova_Timer < diff)
         {
-            if( m_creature->IsNonMeleeSpellCasted(false) )
+            if (m_creature->IsNonMeleeSpellCasted(false))
                 m_creature->InterruptNonMeleeSpells(true);
 
             DoCast(m_creature,SPELL_FROSTNOVA);
@@ -163,23 +163,23 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI
             CanBlink = true;
         }else FrostNova_Timer -= diff;
 
-        if( Frostbolt_Timer < diff )
+        if (Frostbolt_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_FROSTBOLT);
             Frostbolt_Timer = 4500 + rand()%1500;
         }else Frostbolt_Timer -= diff;
 
-        if( FireBall_Timer < diff )
+        if (FireBall_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_FIREBALL);
             FireBall_Timer = 4500 + rand()%1500;
         }else FireBall_Timer -= diff;
 
-        if( CanBlink )
+        if (CanBlink)
         {
-            if( Blink_Timer < diff )
+            if (Blink_Timer < diff)
             {
-                if( m_creature->IsNonMeleeSpellCasted(false) )
+                if (m_creature->IsNonMeleeSpellCasted(false))
                     m_creature->InterruptNonMeleeSpells(true);
 
                 //expire movement, will prevent from running right back to victim after cast
@@ -193,12 +193,12 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI
             }else Blink_Timer -= diff;
         }
 
-        if( Beacon_Timer < diff)
+        if (Beacon_Timer < diff)
         {
-            if( m_creature->IsNonMeleeSpellCasted(false) )
+            if (m_creature->IsNonMeleeSpellCasted(false))
                 m_creature->InterruptNonMeleeSpells(true);
 
-            if( !urand(0,3) )
+            if (!urand(0,3))
                 DoScriptText(SAY_SUMMON, m_creature);
 
             DoCast(m_creature,SPELL_ETHEREAL_BEACON, true);
@@ -249,12 +249,12 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI
     {
         // Send Shaffar to fight
         Creature* Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100);
-        if(!Shaffar || Shaffar->isDead())
+        if (!Shaffar || Shaffar->isDead())
         {
             KillSelf();
             return;
         }
-        if(!Shaffar->isInCombat())
+        if (!Shaffar->isInCombat())
             Shaffar->AI()->AttackStart(who);
     }
 
@@ -268,10 +268,10 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(Check_Timer < diff)
+        if (Check_Timer < diff)
         {
             Creature *Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100);
-            if(!Shaffar || Shaffar->isDead() || !Shaffar->isInCombat())
+            if (!Shaffar || Shaffar->isDead() || !Shaffar->isInCombat())
             {
                 KillSelf();
                 return;
@@ -279,15 +279,15 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI
             Check_Timer = 1000;
         }else Check_Timer -= diff;
 
-        if( ArcaneBolt_Timer < diff )
+        if (ArcaneBolt_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_ARCANE_BOLT);
             ArcaneBolt_Timer = 2000 + rand()%2500;
         }else ArcaneBolt_Timer -= diff;
 
-        if( Apprentice_Timer < diff )
+        if (Apprentice_Timer < diff)
         {
-            if( m_creature->IsNonMeleeSpellCasted(false) )
+            if (m_creature->IsNonMeleeSpellCasted(false))
                 m_creature->InterruptNonMeleeSpells(true);
 
             m_creature->CastSpell(m_creature,SPELL_ETHEREAL_APPRENTICE,true);
@@ -324,12 +324,12 @@ struct TRINITY_DLL_DECL mob_ethereal_apprenticeAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(Cast_Timer < diff)
+        if (Cast_Timer < diff)
         {
-            if(isFireboltTurn)
+            if (isFireboltTurn)
             {
                 m_creature->CastSpell(m_creature->getVictim(), SPELL_ETHEREAL_APPRENTICE_FIREBOLT, true);
                 isFireboltTurn = false;
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp
index 92a4b4e2dfd..634b529f6d2 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp
+++ b/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp
@@ -88,27 +88,27 @@ struct TRINITY_DLL_DECL boss_pandemoniusAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if( VoidBlast_Timer < diff )
+        if (VoidBlast_Timer < diff)
         {
-            if( Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0) )
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
                 DoCast(target,HeroicMode ? H_SPELL_VOID_BLAST : SPELL_VOID_BLAST);
                 VoidBlast_Timer = 500;
                 ++VoidBlast_Counter;
             }
 
-            if( VoidBlast_Counter == 5 )
+            if (VoidBlast_Counter == 5)
             {
                 VoidBlast_Timer = 15000+rand()%10000;
                 VoidBlast_Counter = 0;
             }
         }else VoidBlast_Timer -= diff;
 
-        if( !VoidBlast_Counter )
+        if (!VoidBlast_Counter)
         {
-            if( DarkShell_Timer < diff )
+            if (DarkShell_Timer < diff)
             {
-                if( m_creature->IsNonMeleeSpellCasted(false) )
+                if (m_creature->IsNonMeleeSpellCasted(false))
                     m_creature->InterruptNonMeleeSpells(true);
 
                 DoScriptText(EMOTE_DARK_SHELL, m_creature);
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp
index 86727837219..4576fefc24e 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp
+++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp
@@ -229,17 +229,17 @@ struct TRINITY_DLL_DECL mob_syth_fireAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(flameshock_timer < diff)
+        if (flameshock_timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_FLAME_SHOCK);
 
             flameshock_timer = 5000;
         }else flameshock_timer -= diff;
 
-        if(flamebuffet_timer < diff)
+        if (flamebuffet_timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_FLAME_BUFFET);
 
             flamebuffet_timer = 5000;
@@ -280,17 +280,17 @@ struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(arcaneshock_timer < diff)
+        if (arcaneshock_timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_ARCANE_SHOCK);
 
             arcaneshock_timer = 5000;
         }else arcaneshock_timer -= diff;
 
-        if(arcanebuffet_timer < diff)
+        if (arcanebuffet_timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_ARCANE_BUFFET);
 
             arcanebuffet_timer = 5000;
@@ -331,17 +331,17 @@ struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(frostshock_timer < diff)
+        if (frostshock_timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_FROST_SHOCK);
 
             frostshock_timer = 5000;
         }else frostshock_timer -= diff;
 
-        if(frostbuffet_timer < diff)
+        if (frostbuffet_timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_FROST_BUFFET);
 
             frostbuffet_timer = 5000;
@@ -382,17 +382,17 @@ struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(shadowshock_timer < diff)
+        if (shadowshock_timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_SHADOW_SHOCK);
 
             shadowshock_timer = 5000;
         }else shadowshock_timer -= diff;
 
-        if(shadowbuffet_timer < diff)
+        if (shadowbuffet_timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_SHADOW_BUFFET);
 
             shadowbuffet_timer = 5000;
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
index 5495a2c8998..2aba0f74e5a 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
+++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
@@ -85,9 +85,9 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
+        if (!m_creature->getVictim() && who->isTargetableForAttack() && (m_creature->IsHostileTo(who)) && who->isInAccessiblePlaceFor(m_creature))
         {
-            if(!Intro && m_creature->IsWithinDistInMap(who, 100))
+            if (!Intro && m_creature->IsWithinDistInMap(who, 100))
             {
                 Intro = true;
                 DoScriptText(SAY_INTRO, m_creature);
@@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI
                 return;
 
             float attackRadius = m_creature->GetAttackDistance(who);
-            if( m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who) )
+            if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who))
             {
                 //who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
                 AttackStart(who);
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp
index c18a9dc52b9..3406ce263f7 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp
+++ b/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp
@@ -28,7 +28,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_sethekk_halls : public ScriptedInstance
 {
-    instance_sethekk_halls(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_sethekk_halls(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint64 m_uiIkissDoorGUID;
 
@@ -55,9 +55,9 @@ struct TRINITY_DLL_DECL instance_sethekk_halls : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_sethekk_halls(Map* map)
+InstanceData* GetInstanceData_instance_sethekk_halls(Map* pMap)
 {
-    return new instance_sethekk_halls(map);
+    return new instance_sethekk_halls(pMap);
 }
 
 void AddSC_instance_sethekk_halls()
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
index 30f930ae043..b2401089abe 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
@@ -149,7 +149,7 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public ScriptedAI
         {
             if (EventCheck_Timer < diff)
             {
-                if(pInstance)
+                if (pInstance)
                 {
                     if (pInstance->GetData(TYPE_OVERSEER) == DONE)
                         DoIntro();
@@ -164,10 +164,10 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public ScriptedAI
             //DoWhine("I haz no mount!", LANG_UNIVERSAL, NULL);
         }
 
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(m_creature->HasAura(SPELL_BANISH, 0))
+        if (m_creature->HasAura(SPELL_BANISH, 0))
         {
             EnterEvadeMode();
             return;
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
index 5fc7111edb0..2d2e40b7733 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
@@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL boss_blackheart_the_inciterAI : public ScriptedAI
     {
         DoScriptText(SAY_DEATH, m_creature);
 
-        if( pInstance )
+        if (pInstance)
             pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE);
     }
 
@@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_blackheart_the_inciterAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (InciteChaos)
@@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL boss_blackheart_the_inciterAI : public ScriptedAI
             DoCast(m_creature, SPELL_INCITE_CHAOS);
 
             std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
-            for( std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr )
+            for(std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
             {
                 Unit* target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
                 if (target && target->GetTypeId() == TYPEID_PLAYER)
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
index cfb37b68102..021dc59f810 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
@@ -83,17 +83,17 @@ struct TRINITY_DLL_DECL mob_voidtravelerAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!Vorpil)
+        if (!Vorpil)
         {
             m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
             return;
         }
-        if(move < diff)
+        if (move < diff)
         {
-            if(sacrificed)
+            if (sacrificed)
             {
                 SpellEntry *spell = GET_SPELL(HeroicMode?H_SPELL_EMPOWERING_SHADOWS:SPELL_EMPOWERING_SHADOWS);
-                if( spell )
+                if (spell)
                     Vorpil->AddAura(new Aura(spell, 1, NULL, Vorpil, m_creature));
                 Vorpil->SetHealth(Vorpil->GetHealth()+Vorpil->GetMaxHealth()/25);
                 DoCast(m_creature, SPELL_SHADOW_NOVA, true);
@@ -101,14 +101,14 @@ struct TRINITY_DLL_DECL mob_voidtravelerAI : public ScriptedAI
                 return;
             }
             m_creature->GetMotionMaster()->MoveFollow(Vorpil,0,0);
-            if(m_creature->IsWithinDist(Vorpil, 3))
+            if (m_creature->IsWithinDist(Vorpil, 3))
             {
                 DoCast(m_creature, SPELL_SACRIFICE, false);
                 sacrificed = true;
                 move = 500;
                 return;
             }
-            if(!Vorpil->isInCombat() || Vorpil->isDead())
+            if (!Vorpil->isInCombat() || Vorpil->isDead())
             {
                 m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                 return;
@@ -151,19 +151,19 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
         HelpYell = false;
         destroyPortals();
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, NOT_STARTED);
     }
 
     void summonPortals()
     {
-        if(!sumportals)
+        if (!sumportals)
         {
             for (int i = 0;i<5; ++i)
             {
                 Creature *Portal = NULL;
                 Portal = m_creature->SummonCreature(MOB_VOID_PORTAL,VoidPortalCoords[i][0],VoidPortalCoords[i][1],VoidPortalCoords[i][2],0,TEMPSUMMON_CORPSE_DESPAWN,3000000);
-                if(Portal)
+                if (Portal)
                 {
                     PortalsGuid[i] = Portal->GetGUID();
                     Portal->CastSpell(Portal,SPELL_VOID_PORTAL_VISUAL,false);
@@ -176,7 +176,7 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
 
     void destroyPortals()
     {
-        if(sumportals)
+        if (sumportals)
         {
             for (int i = 0;i < 5; i ++)
             {
@@ -193,7 +193,7 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
     {
         int pos = rand()%5;
         m_creature->SummonCreature(MOB_VOID_TRAVELER,VoidPortalCoords[pos][0],VoidPortalCoords[pos][1],VoidPortalCoords[pos][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,5000);
-        if(!HelpYell)
+        if (!HelpYell)
         {
             DoScriptText(SAY_HELP, m_creature);
             HelpYell = true;
@@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
         DoScriptText(SAY_DEATH, m_creature);
         destroyPortals();
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE);
     }
 
@@ -234,7 +234,7 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
         }
         summonPortals();
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GRANDMASTERVORPILEVENT, IN_PROGRESS);
     }
 
@@ -270,10 +270,10 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
             }
         }else banish_Timer -= diff;
 
-        if ( DrawShadows_Timer < diff)
+        if (DrawShadows_Timer < diff)
         {
-            Map *map = m_creature->GetMap();
-            Map::PlayerList const &PlayerList = map->GetPlayers();
+            Map* pMap = m_creature->GetMap();
+            Map::PlayerList const &PlayerList = pMap->GetPlayers();
             for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
                 if (Player* i_pl = i->getSource())
                     if (i_pl->isAlive() && !i_pl->HasAura(SPELL_BANISH))
@@ -288,12 +288,12 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
             DrawShadows_Timer = 30000;
         }else DrawShadows_Timer -= diff;
 
-        if ( summonTraveler_Timer < diff)
+        if (summonTraveler_Timer < diff)
         {
             spawnVoidTraveler();
             summonTraveler_Timer = 10000;
             //enrage at 20%
-            if((m_creature->GetHealth()*5) < m_creature->GetMaxHealth())
+            if ((m_creature->GetHealth()*5) < m_creature->GetMaxHealth())
                 summonTraveler_Timer = 5000;
         }else summonTraveler_Timer -=diff;
 
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp
index eb48a3dbe7a..3fb42763030 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp
+++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp
@@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI
     void SonicBoomEffect()
     {
         std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
-        for( std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr )
+        for(std::list<HostilReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
         {
            Unit* target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
            if (target && target->GetTypeId() == TYPEID_PLAYER)
@@ -90,7 +90,7 @@ struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI
     // Sonic Boom instant damage (needs core fix instead of this)
     void SpellHitTarget(Unit *target, const SpellEntry *spell)
     {
-        if(target && target->isAlive() && spell && spell->Id == SPELL_SONIC_BOOM_EFFECT)
+        if (target && target->isAlive() && spell && spell->Id == SPELL_SONIC_BOOM_EFFECT)
             m_creature->DealDamage(target,(target->GetHealth()*90)/100,NULL,SPELL_DIRECT_DAMAGE,SPELL_SCHOOL_MASK_NATURE,spell);
     }
 
@@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI
             return;
 
         // Sonic Boom
-        if(SonicBoom)
+        if (SonicBoom)
         {
             DoCast(m_creature, SPELL_SONIC_BOOM_EFFECT, true);
             SonicBoomEffect();
@@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI
         // Murmur's Touch
         if (MurmursTouch_Timer < diff)
         {
-            if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,80,true))
+            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,80,true))
                 DoCast(target, SPELL_MURMURS_TOUCH);
             MurmursTouch_Timer = 25000 + rand()%10000;
         }else MurmursTouch_Timer -= diff;
@@ -149,38 +149,38 @@ struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI
             MagneticPull_Timer = 500;
         }else MagneticPull_Timer -= diff;
 
-        if(HeroicMode)
+        if (HeroicMode)
         {
             // Thundering Storm
-            if(ThunderingStorm_Timer < diff)
+            if (ThunderingStorm_Timer < diff)
             {
                 std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList();
                 for(std::list<HostilReference*>::iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
-                    if(Unit* target = Unit::GetUnit((*m_creature),(*i)->getUnitGuid()))
-                        if(target->isAlive() && !m_creature->IsWithinDist(target, 35, false))
+                    if (Unit* target = Unit::GetUnit((*m_creature),(*i)->getUnitGuid()))
+                        if (target->isAlive() && !m_creature->IsWithinDist(target, 35, false))
                             DoCast(target, SPELL_THUNDERING_STORM, true);
                 ThunderingStorm_Timer = 15000;
             }else ThunderingStorm_Timer -= diff;
 
             // Sonic Shock
-            if(SonicShock_Timer < diff)
+            if (SonicShock_Timer < diff)
             {
-                if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,20,false))
-                    if(target->isAlive())
+                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,20,false))
+                    if (target->isAlive())
                         DoCast(target, SPELL_SONIC_SHOCK);
                 SonicShock_Timer = 10000+rand()%10000;
             }else SonicShock_Timer -= diff;
         }
 
         // Select nearest most aggro target if top aggro too far
-        if(!m_creature->isAttackReady())
+        if (!m_creature->isAttackReady())
             return;
-        if(!m_creature->IsWithinMeleeRange(m_creature->getVictim()))
+        if (!m_creature->IsWithinMeleeRange(m_creature->getVictim()))
         {
             std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList();
             for(std::list<HostilReference*>::iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
-                if(Unit* target = Unit::GetUnit((*m_creature),(*i)->getUnitGuid()))
-                    if(target->isAlive() && m_creature->IsWithinMeleeRange(target))
+                if (Unit* target = Unit::GetUnit((*m_creature),(*i)->getUnitGuid()))
+                    if (target->isAlive() && m_creature->IsWithinMeleeRange(target))
                     {
                         m_creature->TauntApply(target);
                         break;
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
index 584d2f6c976..3429786e85f 100644
--- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
+++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
@@ -38,7 +38,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
 {
-    instance_shadow_labyrinth(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_shadow_labyrinth(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounter[ENCOUNTERS];
     std::string str_data;
@@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounter[i] == IN_PROGRESS) return true;
+            if (Encounter[i] == IN_PROGRESS) return true;
 
         return false;
     }
@@ -109,14 +109,14 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
                 break;
 
             case TYPE_OVERSEER:
-                if( data != DONE )
+                if (data != DONE)
                     error_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER did not expect other data than DONE");
-                if( FelOverseerCount )
+                if (FelOverseerCount)
                 {
                     --FelOverseerCount;
                     debug_log("TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.",FelOverseerCount);
                 }
-                if( FelOverseerCount == 0 )
+                if (FelOverseerCount == 0)
                 {
                     Encounter[1] = DONE;
                     debug_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER == DONE");
@@ -124,13 +124,13 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
                 break;
 
             case DATA_BLACKHEARTTHEINCITEREVENT:
-                if( data == DONE )
+                if (data == DONE)
                     DoUseDoorOrButton(RefectoryDoorGUID);
                 Encounter[2] = data;
                 break;
 
             case DATA_GRANDMASTERVORPILEVENT:
-                if( data == DONE )
+                if (data == DONE)
                     DoUseDoorOrButton(ScreamingHallDoorGUID);
                 Encounter[3] = data;
                 break;
@@ -160,7 +160,7 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
 
     uint32 GetData(uint32 type)
     {
-        switch( type )
+        switch(type)
         {
             case TYPE_HELLMAW: return Encounter[0];
             case TYPE_OVERSEER: return Encounter[1];
@@ -172,7 +172,7 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
 
     uint64 GetData64(uint32 identifier)
     {
-        if(identifier == DATA_GRANDMASTERVORPIL)
+        if (identifier == DATA_GRANDMASTERVORPIL)
             return GrandmasterVorpil;
 
         return 0;
@@ -204,9 +204,9 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_shadow_labyrinth(Map* map)
+InstanceData* GetInstanceData_instance_shadow_labyrinth(Map* pMap)
 {
-    return new instance_shadow_labyrinth(map);
+    return new instance_shadow_labyrinth(pMap);
 }
 
 void AddSC_instance_shadow_labyrinth()
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp
index 0d09c6050f6..4c830237099 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp
+++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_amanitar.cpp
@@ -48,7 +48,7 @@ struct TRINITY_DLL_DECL boss_amanitarAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
index e0bb2360ad1..11d98961bb4 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
+++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
@@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI
 
         DeadAhnkaharGuardian = false;
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ELDER_NADOX_EVENT, NOT_STARTED);
     }
 
@@ -89,13 +89,13 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI
     {
         DoScriptText(SAY_DEATH,m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ELDER_NADOX_EVENT, IN_PROGRESS);
     }
 
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%3)
         {
@@ -109,53 +109,53 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI
     {
         DoScriptText(SAY_SLAY_3,m_creature);
 
-        if(HeroicMode && !DeadAhnkaharGuardian)
+        if (HeroicMode && !DeadAhnkaharGuardian)
         {
             AchievementEntry const *AchievRespectYourElders = GetAchievementStore()->LookupEntry(ACHIEVEMENT_RESPECT_YOUR_ELDERS);
-            if(AchievRespectYourElders)
+            if (AchievRespectYourElders)
             {
-                Map *map = m_creature->GetMap();
-                if(map && map->IsDungeon())
+                Map* pMap = m_creature->GetMap();
+                if (pMap && pMap->IsDungeon())
                 {
-                    Map::PlayerList const &players = map->GetPlayers();
+                    Map::PlayerList const &players = pMap->GetPlayers();
                     for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievRespectYourElders);
                 }            
             }        
         }
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ELDER_NADOX_EVENT, DONE);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(plague_Timer < diff)
+        if (plague_Timer < diff)
         {
             DoCast(m_creature->getVictim(),HeroicMode ? H_SPELL_BROOD_PLAGUE : SPELL_BROOD_PLAGUE);
             plague_Timer = 15000;
         }else plague_Timer -= diff;
 
-        if(HeroicMode)
-            if(rage_Timer < diff)
+        if (HeroicMode)
+            if (rage_Timer < diff)
             {
                 Unit* Swarmer = m_creature->FindNearestCreature(MOB_AHNKAHAR_SWARMER, 35);
 
-                if(Swarmer)
+                if (Swarmer)
                 {
                     DoCast(Swarmer,H_SPELL_BROOD_RAGE,true);
                     rage_Timer = 15000;
                 }
             }else rage_Timer -= diff;
 
-        if(swarmer_spawn_Timer < diff)
+        if (swarmer_spawn_Timer < diff)
         {
             DoCast(m_creature,SPELL_SUMMON_SWARMERS,true);
             DoCast(m_creature,SPELL_SUMMON_SWARMERS);
-            if(rand()%3 == 0)
+            if (rand()%3 == 0)
             {
                 switch(rand()%2)
                 {
@@ -166,23 +166,23 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI
             swarmer_spawn_Timer = 10000;
         }else swarmer_spawn_Timer -= diff;
 
-        if(guard_spawn_Timer < diff)
+        if (guard_spawn_Timer < diff)
         {
             m_creature->MonsterTextEmote("An Ahn'kahar Guardian hatches!",m_creature->GetGUID(),true);
             DoCast(m_creature,SPELL_SUMMON_SWARM_GUARD);
             guard_spawn_Timer = 25000;
         }else guard_spawn_Timer -= diff;
 
-        if(enrage_Timer < diff)
+        if (enrage_Timer < diff)
         {
-            if(m_creature->HasAura(SPELL_ENRAGE,0))
+            if (m_creature->HasAura(SPELL_ENRAGE,0))
                 return;
 
             float x, y, z, o;
             m_creature->GetHomePosition(x, y, z, o);
-            if(z < 24 )
+            if (z < 24)
             {
-                if(!m_creature->IsNonMeleeSpellCasted(false))
+                if (!m_creature->IsNonMeleeSpellCasted(false))
                 {
                     DoCast(m_creature,SPELL_ENRAGE,true);
                 }
@@ -213,14 +213,14 @@ struct TRINITY_DLL_DECL mob_ahnkahar_nerubianAI : public ScriptedAI
 
     void Reset()
     {
-        if(m_creature->GetEntry() == 30176)
+        if (m_creature->GetEntry() == 30176)
             DoCast(m_creature,SPELL_GUARDIAN_AURA,true);
         sprint_Timer = 10000;
     }
 
     void JustDied(Unit *killer)
     {
-        if(m_creature->GetEntry() == MOB_AHNKAHAR_GUARDIAN_ENTRY)
+        if (m_creature->GetEntry() == MOB_AHNKAHAR_GUARDIAN_ENTRY)
             DeadAhnkaharGuardian = true;
     }
 
@@ -228,22 +228,22 @@ struct TRINITY_DLL_DECL mob_ahnkahar_nerubianAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(m_creature->GetEntry() == 30176)
+        if (m_creature->GetEntry() == 30176)
             m_creature->RemoveAurasDueToSpell(SPELL_GUARDIAN_AURA);
 
-        if(pInstance)
+        if (pInstance)
         {
-            if(pInstance->GetData(DATA_ELDER_NADOX_EVENT) != IN_PROGRESS)
+            if (pInstance->GetData(DATA_ELDER_NADOX_EVENT) != IN_PROGRESS)
             {
                 m_creature->DealDamage(m_creature,m_creature->GetHealth());
                 m_creature->RemoveCorpse();
             }
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(sprint_Timer < diff)
+        if (sprint_Timer < diff)
         {
             DoCast(m_creature,SPELL_SPRINT);
             sprint_Timer = 25000;
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
index 506bc969038..23294ea0cee 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
+++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
@@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_volazjAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         phase =1;
@@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL boss_volazjAI : public ScriptedAI
     }
     void JustDied(Unit* killer)
     {
-        if(phase == 1)
+        if (phase == 1)
         DoScriptText(SAY_DEATH_1, m_creature);
         else
         DoScriptText(SAY_DEATH_2, m_creature);
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
index 202e9b09944..25e0921b495 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL boss_jedogaAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
index 2dbfc865629..e9fcb7764ff 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
+++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
@@ -69,7 +69,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/instance_ahnkahet.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
index 9e35d95cdcd..f35de4d8115 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
+++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
@@ -38,7 +38,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance
 {
-    instance_ahnkahet(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_ahnkahet(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint64 Elder_Nadox;
     uint64 Prince_Taldaram;
@@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS) return true;
+            if (Encounters[i] == IN_PROGRESS) return true;
 
         return false;
     }
@@ -161,7 +161,7 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance
         std::istringstream loadStream(in);
         loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3 >> data4;
 
-        if( dataHead1 == 'A' && dataHead2 == 'K')
+        if (dataHead1 == 'A' && dataHead2 == 'K')
         {
             Encounters[0] = data0;
             Encounters[1] = data1;
@@ -179,9 +179,9 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_ahnkahet(Map* map)
+InstanceData* GetInstanceData_instance_ahnkahet(Map* pMap)
 {
-   return new instance_ahnkahet(map);
+   return new instance_ahnkahet(pMap);
 }
 
 void AddSC_instance_ahnkahet()
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp
index 796bc84c7c3..66457657bbb 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp
+++ b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_anubarak.cpp
@@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         phase =1;
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp
index 65dcef9b061..5cc93e293c3 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp
+++ b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_hadronox.cpp
@@ -80,7 +80,7 @@ struct TRINITY_DLL_DECL boss_hadronoxAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         phase =1;
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
index e2c51e941cf..cf117ba4f95 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
@@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) >= 10)
diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
index a054e9ab2d8..c303da45471 100644
--- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
+++ b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
@@ -36,7 +36,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance
 {
-    instance_azjol_nerub(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_azjol_nerub(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint64 Krikthir;
     uint64 Hadronox;
@@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS) return true;
+            if (Encounters[i] == IN_PROGRESS) return true;
 
         return false;
     }
@@ -149,7 +149,7 @@ struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance
         std::istringstream loadStream(in);
         loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2;
 
-        if( dataHead1 == 'A' && dataHead2 == 'N')
+        if (dataHead1 == 'A' && dataHead2 == 'N')
         {
             Encounters[0] = data0;
             Encounters[1] = data1;
@@ -165,9 +165,9 @@ struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_azjol_nerub(Map* map)
+InstanceData* GetInstanceData_instance_azjol_nerub(Map* pMap)
 {
-   return new instance_azjol_nerub(map);
+   return new instance_azjol_nerub(pMap);
 }
 
 void AddSC_instance_azjol_nerub()
diff --git a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp
index bf4db24d305..c9fabd65631 100644
--- a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp
+++ b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp
@@ -53,10 +53,10 @@ struct TRINITY_DLL_DECL mobs_spitelashesAI : public ScriptedAI
 
     void SpellHit(Unit *Hitter, const SpellEntry *Spellkind)
     {
-        if( !spellhit &&
+        if (!spellhit &&
             Hitter->GetTypeId() == TYPEID_PLAYER &&
             CAST_PLR(Hitter)->GetQuestStatus(9364) == QUEST_STATUS_INCOMPLETE &&
-            (Spellkind->Id==118 || Spellkind->Id== 12824 || Spellkind->Id== 12825 || Spellkind->Id== 12826) )
+            (Spellkind->Id==118 || Spellkind->Id== 12824 || Spellkind->Id== 12825 || Spellkind->Id== 12826))
         {
             spellhit=true;
             DoCast(m_creature,29124);                       //become a sheep
@@ -66,22 +66,22 @@ struct TRINITY_DLL_DECL mobs_spitelashesAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         // we mustn't remove the creature in the same round in which we cast the summon spell, otherwise there will be no summons
-        if( spellhit && morphtimer>=5000 )
+        if (spellhit && morphtimer>=5000)
         {
             m_creature->ForcedDespawn();
             return;
         }
         // walk 5 seconds before summoning
-        if( spellhit && morphtimer<5000 )
+        if (spellhit && morphtimer<5000)
         {
             morphtimer+=diff;
-            if( morphtimer>=5000 )
+            if (morphtimer>=5000)
             {
                 DoCast(m_creature,28406);                   //summon copies
                 DoCast(m_creature,6924);                    //visual explosion
             }
         }
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //TODO: add abilities for the different creatures
@@ -97,54 +97,54 @@ CreatureAI* GetAI_mobs_spitelashes(Creature *_Creature)
 ## npc_loramus_thalipedes
 ######*/
 
-bool GossipHello_npc_loramus_thalipedes(Player *player, Creature *_Creature)
+bool GossipHello_npc_loramus_thalipedes(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(2744) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Can you help me?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(2744) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Can you help me?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    if (player->GetQuestStatus(3141) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me your story", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+    if (pPlayer->GetQuestStatus(3141) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me your story", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_loramus_thalipedes(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_loramus_thalipedes(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(2744);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(2744);
             break;
 
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Please continue", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
-            player->SEND_GOSSIP_MENU(1813, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Please continue", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
+            pPlayer->SEND_GOSSIP_MENU(1813, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+21:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I do not understand", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
-            player->SEND_GOSSIP_MENU(1814, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I do not understand", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
+            pPlayer->SEND_GOSSIP_MENU(1814, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+22:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Indeed", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
-            player->SEND_GOSSIP_MENU(1815, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Indeed", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
+            pPlayer->SEND_GOSSIP_MENU(1815, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+23:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will do this with or your help, Loramus", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
-            player->SEND_GOSSIP_MENU(1816, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will do this with or your help, Loramus", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
+            pPlayer->SEND_GOSSIP_MENU(1816, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+24:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
-            player->SEND_GOSSIP_MENU(1817, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
+            pPlayer->SEND_GOSSIP_MENU(1817, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+25:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(3141);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(3141);
             break;
     }
     return true;
@@ -271,36 +271,36 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(Must_Die)
-            if(Must_Die_Timer < diff)
+        if (Must_Die)
+            if (Must_Die_Timer < diff)
             {
                 m_creature->ForcedDespawn();
                 return;
             } else Must_Die_Timer -= diff;
 
-        if(!Escape)
+        if (!Escape)
         {
-            if(!PlayerGUID)
+            if (!PlayerGUID)
                 return;
 
-            if(spellEscape_Timer < diff)
+            if (spellEscape_Timer < diff)
             {
                 DoCast(m_creature, SPELL_RIZZLE_ESCAPE, false);
                 spellEscape_Timer = 10000;
             } else spellEscape_Timer -= diff;
 
-            if(Teleport_Timer < diff)
+            if (Teleport_Timer < diff)
             {
                 //temp solution - unit can't be teleported by core using spelleffect 5, only players
-                Map *map = m_creature->GetMap();
-                if(map)
+                Map* pMap = m_creature->GetMap();
+                if (pMap)
                 {
-                    map->CreatureRelocation(m_creature, 3706.39, -3969.15, 35.9118, 0);
+                    pMap->CreatureRelocation(m_creature, 3706.39, -3969.15, 35.9118, 0);
                     m_creature->AI_SendMoveToPacket(3706.39, -3969.15, 35.9118, 0, 0, 0);
                 }
                 //begin swimming and summon depth charges
-                Player* player = Unit::GetPlayer(PlayerGUID);
-                SendText(MSG_ESCAPE_NOTICE, player);
+                Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+                SendText(MSG_ESCAPE_NOTICE, pPlayer);
                 DoCast(m_creature, SPELL_PERIODIC_DEPTH_CHARGE);
                 m_creature->SetUnitMovementFlags(MOVEMENTFLAG_HOVER | MOVEMENTFLAG_SWIMMING);
                 m_creature->SetSpeed(MOVE_RUN, 0.85f, true);
@@ -312,33 +312,33 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI
             return;
         }
 
-        if(ContinueWP)
+        if (ContinueWP)
         {
             m_creature->GetMotionMaster()->MovePoint(CurrWP, WPs[CurrWP][0], WPs[CurrWP][1], WPs[CurrWP][2]);
             ContinueWP = false;
         }
 
-        if(Grenade_Timer < diff)
+        if (Grenade_Timer < diff)
         {
-            Player *player = Unit::GetPlayer(PlayerGUID);
-            if(player)
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (pPlayer)
             {
-               DoScriptText(SAY_RIZZLE_GRENADE, m_creature, player);
-               DoCast(player, SPELL_RIZZLE_FROST_GRENADE, true);
+               DoScriptText(SAY_RIZZLE_GRENADE, m_creature, pPlayer);
+               DoCast(pPlayer, SPELL_RIZZLE_FROST_GRENADE, true);
             }
             Grenade_Timer = 30000;
         } else Grenade_Timer -= diff;
 
-        if(Check_Timer < diff)
+        if (Check_Timer < diff)
         {
-            Player *player = Unit::GetPlayer(PlayerGUID);
-            if(!player)
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (!pPlayer)
             {
                 m_creature->ForcedDespawn();
                 return;
             }
 
-            if(m_creature->IsWithinDist(player, 10) && m_creature->GetPositionX() > player->GetPositionX() && !Reached)
+            if (m_creature->IsWithinDist(pPlayer, 10) && m_creature->GetPositionX() > pPlayer->GetPositionX() && !Reached)
             {
                 DoScriptText(SAY_RIZZLE_FINAL, m_creature);
                 m_creature->SetUInt32Value(UNIT_NPC_FLAGS, 1);
@@ -353,12 +353,12 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI
 
     }
 
-    void SendText(const char *text, Player* player)
+    void SendText(const char *text, Player* pPlayer)
     {
         WorldPacket data(SMSG_SERVER_MESSAGE, 0);              // guess size
         data << text;
-        if(player)
-            player->GetSession()->SendPacket(&data);
+        if (pPlayer)
+            pPlayer->GetSession()->SendPacket(&data);
     }
 
     void AttackStart(Unit *who)
@@ -366,7 +366,7 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI
         if (!who || PlayerGUID)
             return;
 
-        if(who->GetTypeId() == TYPEID_PLAYER && CAST_PLR(who)->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE)
+        if (who->GetTypeId() == TYPEID_PLAYER && CAST_PLR(who)->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE)
         {
             PlayerGUID = who->GetGUID();
             DoScriptText(SAY_RIZZLE_START, m_creature);
@@ -382,7 +382,7 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI
         if (type != POINT_MOTION_TYPE)
             return;
 
-        if(id == 57)
+        if (id == 57)
         {
             m_creature->ForcedDespawn();
             return;
@@ -394,21 +394,21 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI
 
 };
 
-bool GossipHello_mob_rizzle_sprysprocket(Player *player, Creature *_Creature)
+bool GossipHello_mob_rizzle_sprysprocket(Player* pPlayer, Creature *_Creature)
 {
-    if(player->GetQuestStatus(10994) != QUEST_STATUS_INCOMPLETE)
+    if (pPlayer->GetQuestStatus(10994) != QUEST_STATUS_INCOMPLETE)
         return true;
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GET_MOONSTONE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->SEND_GOSSIP_MENU(10811,_Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GET_MOONSTONE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->SEND_GOSSIP_MENU(10811,_Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_mob_rizzle_sprysprocket(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_mob_rizzle_sprysprocket(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if (action == GOSSIP_ACTION_INFO_DEF + 1 && player->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE)
+    if (action == GOSSIP_ACTION_INFO_DEF + 1 && pPlayer->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE)
     {
-        player->CLOSE_GOSSIP_MENU();
-        _Creature->CastSpell(player, SPELL_GIVE_SOUTHFURY_MOONSTONE, true);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        _Creature->CastSpell(pPlayer, SPELL_GIVE_SOUTHFURY_MOONSTONE, true);
         CAST_AI(mob_rizzle_sprysprocketAI, _Creature->AI())->Must_Die_Timer = 3000;
         CAST_AI(mob_rizzle_sprysprocketAI, _Creature->AI())->Must_Die = true;
     }
@@ -441,8 +441,8 @@ struct TRINITY_DLL_DECL mob_depth_chargeAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(we_must_die)
-            if(must_die_timer < diff)
+        if (we_must_die)
+            if (must_die_timer < diff)
             {
                 m_creature->ForcedDespawn();
             } else must_die_timer -= diff;
@@ -454,7 +454,7 @@ struct TRINITY_DLL_DECL mob_depth_chargeAI : public ScriptedAI
         if (!who)
             return;
 
-        if(who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 5))
+        if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 5))
         {
             DoCast(who, SPELL_DEPTH_CHARGE_TRAP);
             we_must_die = true;
diff --git a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp
index 10c8592c4fa..8661d89a95d 100644
--- a/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp
+++ b/src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp
@@ -65,10 +65,10 @@ struct TRINITY_DLL_DECL boss_azuregosAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(Teleport_Timer < diff)
+        if (Teleport_Timer < diff)
         {
             DoScriptText(SAY_TELEPORT, m_creature);
             std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList();
@@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_azuregosAI : public ScriptedAI
             for (i = m_threatlist.begin(); i!= m_threatlist.end(); ++i)
             {
                 Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
-                if(pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER))
+                if (pUnit && (pUnit->GetTypeId() == TYPEID_PLAYER))
                 {
                     DoTeleportPlayer(pUnit, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ()+3, pUnit->GetOrientation());
                 }
diff --git a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp
index ae17df0d0c2..6a0d1527456 100644
--- a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp
+++ b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp
@@ -127,7 +127,7 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI
             {
                 m_creature->RemoveAurasDueToSpell(SPELL_IRRIDATION);
 
-                if (Player *pPlayer = Unit::GetPlayer(pCaster))
+                if (Player* pPlayer = Unit::GetPlayer(pCaster))
                 {
                     switch (rand()%4)
                     {
@@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL npc_engineer_spark_overgrindAI : public ScriptedAI
         NormFaction = c->getFaction();
         NpcFlags = c->GetUInt32Value(UNIT_NPC_FLAGS);
 
-        if(c->GetAreaId() == AREA_COVE || c->GetAreaId() == AREA_ISLE)
+        if (c->GetAreaId() == AREA_COVE || c->GetAreaId() == AREA_ISLE)
             IsTreeEvent = true; 
     }
 
@@ -228,7 +228,7 @@ struct TRINITY_DLL_DECL npc_engineer_spark_overgrindAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if( !m_creature->isInCombat() && !IsTreeEvent )
+        if (!m_creature->isInCombat() && !IsTreeEvent)
         {
             if (Emote_Timer < diff)
             {
@@ -237,10 +237,10 @@ struct TRINITY_DLL_DECL npc_engineer_spark_overgrindAI : public ScriptedAI
                 Emote_Timer = 120000 + rand()%30000;
             }else Emote_Timer -= diff;
         }
-        else if(IsTreeEvent)
+        else if (IsTreeEvent)
             return;
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         if (Dynamite_Timer < diff)
@@ -258,22 +258,22 @@ CreatureAI* GetAI_npc_engineer_spark_overgrind(Creature *_Creature)
     return new npc_engineer_spark_overgrindAI (_Creature);
 }
 
-bool GossipHello_npc_engineer_spark_overgrind(Player *player, Creature *_Creature)
+bool GossipHello_npc_engineer_spark_overgrind(Player* pPlayer, Creature *_Creature)
 {
-    if( player->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_engineer_spark_overgrind(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_engineer_spark_overgrind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_INFO_DEF )
+    if (action == GOSSIP_ACTION_INFO_DEF)
     {
-        player->CLOSE_GOSSIP_MENU();
+        pPlayer->CLOSE_GOSSIP_MENU();
         _Creature->setFaction(FACTION_HOSTILE);
-        CAST_AI(npc_engineer_spark_overgrindAI, _Creature->AI())->AttackStart(player);
+        CAST_AI(npc_engineer_spark_overgrindAI, _Creature->AI())->AttackStart(pPlayer);
     }
     return true;
 }
@@ -338,26 +338,26 @@ struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!player)
+        if (!pPlayer)
             return;
 
         switch(i)
         {
         case 0:
-            DoScriptText(SAY_START, m_creature, player);
+            DoScriptText(SAY_START, m_creature, pPlayer);
             break;
         case 17:
-            DoScriptText(SAY_PROGRESS, m_creature, player);
+            DoScriptText(SAY_PROGRESS, m_creature, pPlayer);
             break;
         case 28:
-            DoScriptText(SAY_END1, m_creature, player);
+            DoScriptText(SAY_END1, m_creature, pPlayer);
             break;
         case 29:
-            DoScriptText(EMOTE_HUG, m_creature, player);
-            DoScriptText(SAY_END2, m_creature, player);
-            player->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP,m_creature);
+            DoScriptText(EMOTE_HUG, m_creature, pPlayer);
+            DoScriptText(SAY_END2, m_creature, pPlayer);
+            pPlayer->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP,m_creature);
             break;
         }
     }
@@ -377,9 +377,9 @@ struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI
     {
         if (PlayerGUID)
         {
-            Player* player = Unit::GetPlayer(PlayerGUID);
-            if (player)
-                player->FailQuest(QUEST_A_CRY_FOR_SAY_HELP);
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (pPlayer)
+                pPlayer->FailQuest(QUEST_A_CRY_FOR_SAY_HELP);
         }
     }
 
@@ -389,12 +389,12 @@ struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI
     }
 };
 
-bool QuestAccept_npc_magwin(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_magwin(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_A_CRY_FOR_SAY_HELP)
     {
         creature->setFaction(113);
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
     }
     return true;
 }
@@ -455,7 +455,7 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI
         Step = 1;
         EventStarted = true;
         Creature* Spark = m_creature->SummonCreature(MOB_SPARK, SparkPos[0], SparkPos[1], SparkPos[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000);
-        if(Spark)
+        if (Spark)
         {
             SparkGUID = Spark->GetGUID();
             Spark->setActive(true);
@@ -479,7 +479,7 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI
             return 1000;
         case 2:
             DoScriptText(GEEZLE_SAY_1, m_creature, Spark);
-            if(Spark)
+            if (Spark)
             {
                 Spark->SetInFront(m_creature);
                 m_creature->SetInFront(Spark);
@@ -493,11 +493,11 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI
         case 8: DoScriptText(GEEZLE_SAY_7, m_creature, Spark); return 2000;
         case 9:
             m_creature->GetMotionMaster()->MoveTargetedHome();
-            if(Spark)
+            if (Spark)
                 Spark->GetMotionMaster()->MovePoint(0, -5030.95, -11291.99, 7.97);
             return 20000;
         case 10:
-            if(Spark)
+            if (Spark)
                 Spark->DealDamage(Spark,Spark->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
             //DespawnNagaFlag(false);
             m_creature->SetVisibility(VISIBILITY_OFF);
@@ -510,13 +510,13 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI
         std::list<GameObject*> FlagList;
         m_creature->GetGameObjectListWithEntryInGrid(FlagList,GO_NAGA_FLAG, 50.0f);
 
-        Player* player = NULL;
+        Player* pPlayer = NULL;
         if (!FlagList.empty())
         {
             for(std::list<GameObject*>::iterator itr = FlagList.begin(); itr != FlagList.end(); ++itr)
             {
                 //TODO: Found how to despawn and respawn
-                if(despawn)
+                if (despawn)
                     (*itr)->Delete();
                 else
                     (*itr)->Respawn();
@@ -526,9 +526,9 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(SayTimer < diff)
+        if (SayTimer < diff)
         {
-            if(EventStarted)
+            if (EventStarted)
             {
                 SayTimer = NextStep(++Step);
             }
diff --git a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp
index 76e2d0603e7..6c88d036bca 100644
--- a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp
+++ b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp
@@ -45,16 +45,16 @@ enum
 
 bool GossipHello_npc_beaten_corpse(Player* pPlayer, Creature* pCreature)
 {
-    if( pPlayer->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_COMPLETE)
+    if (pPlayer->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_COMPLETE)
         pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CORPSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
     pPlayer->SEND_GOSSIP_MENU(3557, pCreature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_beaten_corpse(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action )
+bool GossipSelect_npc_beaten_corpse(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
 {
-    if(action == GOSSIP_ACTION_INFO_DEF +1)
+    if (action == GOSSIP_ACTION_INFO_DEF +1)
     {
         pPlayer->SEND_GOSSIP_MENU(3558, pCreature->GetGUID());
         pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID());
@@ -68,24 +68,24 @@ bool GossipSelect_npc_beaten_corpse(Player* pPlayer, Creature* pCreature, uint32
 
 #define GOSSIP_SPUTTERVALVE "Can you tell me about this shard?"
 
-bool GossipHello_npc_sputtervalve(Player *player, Creature *_Creature)
+bool GossipHello_npc_sputtervalve(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( player->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SPUTTERVALVE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SPUTTERVALVE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_sputtervalve(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_sputtervalve(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if(action == GOSSIP_ACTION_INFO_DEF)
+    if (action == GOSSIP_ACTION_INFO_DEF)
     {
-        player->SEND_GOSSIP_MENU(2013, _Creature->GetGUID());
-        player->AreaExploredOrEventHappens(6981);
+        pPlayer->SEND_GOSSIP_MENU(2013, _Creature->GetGUID());
+        pPlayer->AreaExploredOrEventHappens(6981);
     }
     return true;
 }
@@ -243,7 +243,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(!who || (!who->isAlive())) return;
+        if (!who || (!who->isAlive())) return;
 
         if (m_creature->IsWithinDistInMap(who, 10.0f) && (who->GetTypeId() == TYPEID_PLAYER) && CAST_PLR(who)->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE && !EventInProgress)
         {
@@ -259,13 +259,13 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
         if (EventInProgress) {
             Player* pWarrior = NULL;
 
-            if(PlayerGUID)
+            if (PlayerGUID)
                 pWarrior = Unit::GetPlayer(PlayerGUID);
 
-            if(!pWarrior)
+            if (!pWarrior)
                 return;
 
-            if(!pWarrior->isAlive() && pWarrior->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE) {
+            if (!pWarrior->isAlive() && pWarrior->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE) {
                 EventInProgress = false;
                 DoScriptText(SAY_TWIGGY_FLATHEAD_DOWN, m_creature);
                 pWarrior->FailQuest(1719);
@@ -275,8 +275,8 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
                     if (AffrayChallenger[i])
                     {
                         Creature* pCreature = Unit::GetCreature((*m_creature), AffrayChallenger[i]);
-                        if(pCreature) {
-                            if(pCreature->isAlive())
+                        if (pCreature) {
+                            if (pCreature->isAlive())
                             {
                                 pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
                                 pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -291,8 +291,8 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
                 if (BigWill)
                 {
                     Creature* pCreature = Unit::GetCreature((*m_creature), BigWill);
-                    if(pCreature) {
-                        if(pCreature->isAlive()) {
+                    if (pCreature) {
+                        if (pCreature->isAlive()) {
                             pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
                             pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                             pCreature->setDeathState(JUST_DIED);
@@ -314,7 +314,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
                     for(uint8 i = 0; i < 6; ++i)
                     {
                         Creature* pCreature = m_creature->SummonCreature(AFFRAY_CHALLENGER, AffrayChallengerLoc[i][0], AffrayChallengerLoc[i][1], AffrayChallengerLoc[i][2], AffrayChallengerLoc[i][3], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
-                        if(!pCreature)
+                        if (!pCreature)
                             continue;
                         pCreature->setFaction(35);
                         pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -336,7 +336,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
                         if (AffrayChallenger[i])
                         {
                             Creature* pCreature = Unit::GetCreature((*m_creature), AffrayChallenger[i]);
-                            if((!pCreature || (!pCreature->isAlive())) && !Challenger_down[i])
+                            if ((!pCreature || (!pCreature->isAlive())) && !Challenger_down[i])
                             {
                                 DoScriptText(SAY_TWIGGY_FLATHEAD_DOWN, m_creature);
                                 Challenger_down[i] = true;
@@ -346,13 +346,13 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
                     Challenger_checker = 1000;
                 } else Challenger_checker -= diff;
 
-                if(Wave_Timer < diff)
+                if (Wave_Timer < diff)
                 {
                     if (AffrayChallenger[Wave] && Wave < 6 && !EventBigWill)
                     {
                         DoScriptText(SAY_TWIGGY_FLATHEAD_FRAY, m_creature);
                         Creature* pCreature = Unit::GetCreature((*m_creature), AffrayChallenger[Wave]);
-                        if(pCreature && (pCreature->isAlive()))
+                        if (pCreature && (pCreature->isAlive()))
                         {
                             pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                             pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -364,7 +364,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
                         }
                     }
                     else if (Wave >= 6 && !EventBigWill) {
-                        if(Creature* pCreature = m_creature->SummonCreature(BIG_WILL, -1722, -4341, 6.12, 6.26, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 480000))
+                        if (Creature* pCreature = m_creature->SummonCreature(BIG_WILL, -1722, -4341, 6.12, 6.26, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 480000))
                         {
                             BigWill = pCreature->GetGUID();
                             //pCreature->GetMotionMaster()->MovePoint(0, -1693, -4343, 4.32);
@@ -435,9 +435,9 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if(!player)
+        if (!pPlayer)
             return;
 
         switch(i)
@@ -445,11 +445,11 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI
         case 0: DoScriptText(SAY_PROGRESS_1, m_creature);
             m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break;
         case 1: DoScriptText(SAY_PROGRESS_2, m_creature); break;
-        case 10: DoScriptText(SAY_PROGRESS_3, m_creature, player);
+        case 10: DoScriptText(SAY_PROGRESS_3, m_creature, pPlayer);
             m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break;
         case 20:{
             Unit* Mercenary = m_creature->FindNearestCreature(MOB_MERCENARY, 99);
-            if(Mercenary)
+            if (Mercenary)
             {
                 DoScriptText(SAY_MERCENARY_4, Mercenary);
                 CAST_CRE(Mercenary)->AI()->AttackStart(m_creature);
@@ -464,7 +464,7 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI
         case 31: m_creature->SummonCreature(NPC_PILOT, 1088.77, -2985.39, 91.84, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 300000);
             m_creature->setDeathState(JUST_DIED);
             Completed = true;
-            player->GroupEventHappens(QUEST_ESCAPE, m_creature);
+            pPlayer->GroupEventHappens(QUEST_ESCAPE, m_creature);
             break;
         }
     }
@@ -473,7 +473,7 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI
     {
         m_creature->setDeathState(ALIVE);
         Completed = false;
-        if(!IsBeingEscorted)
+        if (!IsBeingEscorted)
         {
             m_creature->setFaction(uiNormFaction);
             if (m_creature->getStandState() == UNIT_STAND_STATE_DEAD)
@@ -487,9 +487,9 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI
     {
         if (PlayerGUID && !Completed)
         {
-            Player* player = Unit::GetPlayer(PlayerGUID);
-            if (player)
-                player->FailQuest(QUEST_ESCAPE);
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (pPlayer)
+                pPlayer->FailQuest(QUEST_ESCAPE);
         }
     }
 
@@ -499,12 +499,12 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI
     }
 };
 
-bool QuestAccept_npc_wizzlecrank_shredder(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_wizzlecrank_shredder(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_ESCAPE)
     {
          creature->setFaction(FACTION_RATCHET);
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp b/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp
index 1cd1918cbc3..61c701eee55 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp
@@ -35,24 +35,24 @@ EndContentData */
 #define SPELL_TELEPORT      41566                           // s41566 - Teleport to Ashtongue NPC's
 #define GOSSIP_OLUM1        "Teleport me to the other Ashtongue Deathsworn"
 
-bool GossipHello_npc_spirit_of_olum(Player* player, Creature* _Creature)
+bool GossipHello_npc_spirit_of_olum(Player* pPlayer, Creature* _Creature)
 {
     ScriptedInstance* pInstance = (_Creature->GetInstanceData());
 
-    if(pInstance && (pInstance->GetData(DATA_SUPREMUSEVENT) >= DONE) && (pInstance->GetData(DATA_HIGHWARLORDNAJENTUSEVENT) >= DONE))
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_OLUM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    if (pInstance && (pInstance->GetData(DATA_SUPREMUSEVENT) >= DONE) && (pInstance->GetData(DATA_HIGHWARLORDNAJENTUSEVENT) >= DONE))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_OLUM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_spirit_of_olum(Player* player, Creature* _Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_spirit_of_olum(Player* pPlayer, Creature* _Creature, uint32 sender, uint32 action)
 {
-    if(action == GOSSIP_ACTION_INFO_DEF + 1)
-        player->CLOSE_GOSSIP_MENU();
+    if (action == GOSSIP_ACTION_INFO_DEF + 1)
+        pPlayer->CLOSE_GOSSIP_MENU();
 
-    player->InterruptNonMeleeSpells(false);
-    player->CastSpell(player, SPELL_TELEPORT, false);
+    pPlayer->InterruptNonMeleeSpells(false);
+    pPlayer->CastSpell(pPlayer, SPELL_TELEPORT, false);
     return true;
 }
 
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp
index 18d2c8638fe..149bfb0bb07 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp
@@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GURTOGGBLOODBOILEVENT, NOT_STARTED);
 
         TargetGUID = 0;
@@ -109,7 +109,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
     {
         DoZoneInCombat();
         DoScriptText(SAY_AGGRO, m_creature);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GURTOGGBLOODBOILEVENT, IN_PROGRESS);
     }
 
@@ -124,7 +124,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
 
     void JustDied(Unit *victim)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GURTOGGBLOODBOILEVENT, DONE);
 
         DoScriptText(SAY_DEATH, m_creature);
@@ -136,17 +136,17 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
         // Get the Threat List
         std::list<HostilReference *> m_threatlist = m_creature->getThreatManager().getThreatList();
 
-        if(!m_threatlist.size()) // He doesn't have anyone in his threatlist, useless to continue
+        if (!m_threatlist.size()) // He doesn't have anyone in his threatlist, useless to continue
             return;
 
         std::list<Unit *> targets;
         std::list<HostilReference *>::iterator itr = m_threatlist.begin();
-        for( ; itr!= m_threatlist.end(); ++itr)             //store the threat list in a different container
+        for(; itr!= m_threatlist.end(); ++itr)             //store the threat list in a different container
         {
             Unit *target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
                                                             //only on alive players
-            if(target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER )
-                targets.push_back( target);
+            if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER)
+                targets.push_back(target);
         }
 
         //Sort the list of players
@@ -155,13 +155,13 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
         targets.resize(5);
 
         //Aura each player in the targets list with Bloodboil. Aura code copied+pasted from Aura command in Level3.cpp
-        /*SpellEntry const *spellInfo = GetSpellStore()->LookupEntry( SPELL_BLOODBOIL );
-        if(spellInfo)
+        /*SpellEntry const *spellInfo = GetSpellStore()->LookupEntry(SPELL_BLOODBOIL);
+        if (spellInfo)
         {
             for(std::list<Unit *>::iterator itr = targets.begin(); itr != targets.end(); ++itr)
             {
                 Unit* target = *itr;
-                if(!target) return;
+                if (!target) return;
                 for(uint32 i = 0;i<3; ++i)
                 {
                     uint8 eff = spellInfo->Effect[i];
@@ -179,35 +179,35 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
     {
         Unit* pUnit = NULL;
         pUnit = Unit::GetUnit((*m_creature), guid);
-        if(pUnit)
+        if (pUnit)
         {
-            if(DoGetThreat(pUnit))
+            if (DoGetThreat(pUnit))
                 DoModifyThreatPercent(pUnit, -100);
-            if(TargetThreat)
+            if (TargetThreat)
                 m_creature->AddThreat(pUnit, TargetThreat);
         }
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(ArcingSmashTimer < diff)
+        if (ArcingSmashTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_ARCING_SMASH);
             ArcingSmashTimer = 10000;
         }else ArcingSmashTimer -= diff;
 
-        if(FelAcidTimer < diff)
+        if (FelAcidTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_FEL_ACID);
             FelAcidTimer = 25000;
         }else FelAcidTimer -= diff;
 
-        if(!m_creature->HasAura(SPELL_BERSERK))
+        if (!m_creature->HasAura(SPELL_BERSERK))
         {
-            if(EnrageTimer < diff)
+            if (EnrageTimer < diff)
             {
                 DoCast(m_creature, SPELL_BERSERK);
                 switch(rand()%2)
@@ -218,9 +218,9 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
             }else EnrageTimer -= diff;
         }
 
-        if(Phase1)
+        if (Phase1)
         {
-            if(BewilderingStrikeTimer < diff)
+            if (BewilderingStrikeTimer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_BEWILDERING_STRIKE);
                 float mt_threat = DoGetThreat(m_creature->getVictim());
@@ -229,22 +229,22 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
                 BewilderingStrikeTimer = 20000;
             }else BewilderingStrikeTimer -= diff;
 
-            if(EjectTimer < diff)
+            if (EjectTimer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_EJECT1);
                 DoModifyThreatPercent(m_creature->getVictim(), -40);
                 EjectTimer = 15000;
             }else EjectTimer -= diff;
 
-            if(AcidicWoundTimer < diff)
+            if (AcidicWoundTimer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_ACIDIC_WOUND);
                 AcidicWoundTimer = 10000;
             }else AcidicWoundTimer -= diff;
 
-            if(BloodboilTimer < diff)
+            if (BloodboilTimer < diff)
             {
-                if(BloodboilCount < 5)                      // Only cast it five times.
+                if (BloodboilCount < 5)                      // Only cast it five times.
                 {
                     //CastBloodboil(); // Causes issues on windows, so is commented out.
                     DoCast(m_creature->getVictim(), SPELL_BLOODBOIL);
@@ -254,34 +254,34 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
             }else BloodboilTimer -= diff;
         }
 
-        if(!Phase1)
+        if (!Phase1)
         {
-            if(AcidGeyserTimer < diff)
+            if (AcidGeyserTimer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_ACID_GEYSER);
                 AcidGeyserTimer = 30000;
             }else AcidGeyserTimer -= diff;
 
-            if(EjectTimer < diff)
+            if (EjectTimer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_EJECT2);
                 EjectTimer = 15000;
             }else EjectTimer -= diff;
         }
 
-        if(PhaseChangeTimer < diff)
+        if (PhaseChangeTimer < diff)
         {
-            if(Phase1)
+            if (Phase1)
             {
                 Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                if(target && target->isAlive())
+                if (target && target->isAlive())
                 {
                     Phase1 = false;
 
                     TargetThreat = DoGetThreat(target);
                     TargetGUID = target->GetGUID();
                     target->CastSpell(m_creature, SPELL_TAUNT_GURTOGG, true);
-                    if(DoGetThreat(target))
+                    if (DoGetThreat(target))
                         DoModifyThreatPercent(target, -100);
                     m_creature->AddThreat(target, 50000000.0f);
                     m_creature->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
@@ -308,7 +308,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
                 }
             }else                                           // Encounter is a loop pretty much. Phase 1 -> Phase 2 -> Phase 1 -> Phase 2 till death or enrage
             {
-                if(TargetGUID)
+                if (TargetGUID)
                     RevertThreatOnTarget(TargetGUID);
                 TargetGUID = 0;
                 Phase1 = true;
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp
index ac514fcf62d..44399736b8e 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp
@@ -370,7 +370,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
         m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true);
 
         SpellEntry *TempSpell = GET_SPELL(SPELL_SHADOWFIEND_PASSIVE);
-        if(TempSpell)
+        if (TempSpell)
             TempSpell->EffectApplyAuraName[0] = 4; // proc debuff, and summon infinite fiends
     }
 
@@ -399,13 +399,13 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
 
     void SummonedCreatureDespawn(Creature* summon)
     {
-        if(summon->GetCreatureInfo()->Entry == FLAME_OF_AZZINOTH)
+        if (summon->GetCreatureInfo()->Entry == FLAME_OF_AZZINOTH)
         {
             for(uint8 i = 0; i < 2; ++i)
-                if(summon->GetGUID() == FlameGUID[i])
+                if (summon->GetGUID() == FlameGUID[i])
                     FlameGUID[i] = 0;
 
-            if(!FlameGUID[0] && !FlameGUID[1] && Phase != PHASE_ILLIDAN_NULL)
+            if (!FlameGUID[0] && !FlameGUID[1] && Phase != PHASE_ILLIDAN_NULL)
             {
                 m_creature->InterruptNonMeleeSpells(true);
                 EnterPhase(PHASE_FLIGHT_SEQUENCE);
@@ -416,9 +416,9 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
 
     void MovementInform(uint32 MovementType, uint32 Data)
     {
-        if(FlightCount == 7) //change hover point
+        if (FlightCount == 7) //change hover point
         {
-            if(m_creature->getVictim())
+            if (m_creature->getVictim())
             {
                 m_creature->SetInFront(m_creature->getVictim());
                 m_creature->StopMoving();
@@ -437,10 +437,10 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
 
     void AttackStart(Unit *who)
     {
-        if(!who || Phase >= PHASE_TALK_SEQUENCE)
+        if (!who || Phase >= PHASE_TALK_SEQUENCE)
             return;
 
-        if(Phase == PHASE_FLIGHT || Phase == PHASE_DEMON)
+        if (Phase == PHASE_FLIGHT || Phase == PHASE_DEMON)
             AttackStartNoMove(who);
         else
             ScriptedAI::AttackStart(who);
@@ -452,7 +452,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
     {
         m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
 
-        if(!pInstance)
+        if (!pInstance)
             return;
 
         pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, DONE); // Completed
@@ -463,7 +463,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
 
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature) return;
+        if (victim == m_creature) return;
 
         switch(rand()%2)
         {
@@ -480,17 +480,17 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(damage >= m_creature->GetHealth() && done_by != m_creature)
+        if (damage >= m_creature->GetHealth() && done_by != m_creature)
             damage = 0;
-        if(done_by->GetGUID() == MaievGUID)
+        if (done_by->GetGUID() == MaievGUID)
             done_by->AddThreat(m_creature, -(3*(float)damage)/4); // do not let maiev tank him
     }
 
     void SpellHit(Unit *caster, const SpellEntry *spell)
     {
-        if(spell->Id == SPELL_GLAIVE_RETURNS) // Re-equip our warblades!
+        if (spell->Id == SPELL_GLAIVE_RETURNS) // Re-equip our warblades!
         {
-            if(!m_creature->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID))
+            if (!m_creature->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID))
                 SetEquipmentSlots(false, EQUIP_ID_MAIN_HAND, EQUIP_UNEQUIP, EQUIP_NO_CHANGE);
             else
                 SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_ID_OFF_HAND, EQUIP_NO_CHANGE);
@@ -502,7 +502,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
     {
         for(std::list<HostilReference*>::iterator itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr)
         {
-            if((*itr)->getUnitGuid() == TargetGUID)
+            if ((*itr)->getUnitGuid() == TargetGUID)
             {
                 (*itr)->removeReference();
                 break;
@@ -515,20 +515,20 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
         Timer[EVENT_TALK_SEQUENCE] = Conversation[count].timer;
 
         Creature* creature = NULL;
-        if(Conversation[count].creature == ILLIDAN_STORMRAGE)
+        if (Conversation[count].creature == ILLIDAN_STORMRAGE)
             creature = m_creature;
-        else if(Conversation[count].creature == AKAMA)
+        else if (Conversation[count].creature == AKAMA)
             creature = (Unit::GetCreature((*m_creature), AkamaGUID));
-        else if(Conversation[count].creature == MAIEV_SHADOWSONG)
+        else if (Conversation[count].creature == MAIEV_SHADOWSONG)
             creature = (Unit::GetCreature((*m_creature), MaievGUID));
 
-        if(creature)
+        if (creature)
         {
-            if(Conversation[count].emote)
+            if (Conversation[count].emote)
                 creature->HandleEmoteCommand(Conversation[count].emote); // Make the creature do some animation!
-            if(Conversation[count].text)
+            if (Conversation[count].text)
                 creature->MonsterYell(Conversation[count].text, LANG_UNIVERSAL, 0); // Have the creature yell out some text
-            if(Conversation[count].sound)
+            if (Conversation[count].sound)
                 DoPlaySoundToSet(creature, Conversation[count].sound); // Play some sound on the creature
         }
     }
@@ -558,7 +558,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
             {
                 uint8 i=1;
                 Creature* Glaive = m_creature->SummonCreature(BLADE_OF_AZZINOTH, GlaivePosition[i].x, GlaivePosition[i].y, GlaivePosition[i].z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
-                if(Glaive)
+                if (Glaive)
                 {
                     GlaiveGUID[i] = Glaive->GetGUID();
                     Glaive->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -574,7 +574,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
             {
                 uint8 i=0;
                 Creature* Glaive = m_creature->SummonCreature(BLADE_OF_AZZINOTH, GlaivePosition[i].x, GlaivePosition[i].y, GlaivePosition[i].z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
-                if(Glaive)
+                if (Glaive)
                 {
                     GlaiveGUID[i] = Glaive->GetGUID();
                     Glaive->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -600,10 +600,10 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
         case 8://glaive return
             for(uint8 i = 0; i < 2; ++i)
             {
-                if(GlaiveGUID[i])
+                if (GlaiveGUID[i])
                 {
                     Unit* Glaive = Unit::GetUnit((*m_creature), GlaiveGUID[i]);
-                    if(Glaive)
+                    if (Glaive)
                     {
                         Glaive->CastSpell(m_creature, SPELL_GLAIVE_RETURNS, false); // Make it look like the Glaive flies back up to us
                         Glaive->SetDisplayId(11686); // disappear but not die for now
@@ -618,9 +618,9 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
             m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
             for(uint8 i = 0; i < 2; ++i)
             {
-                if(GlaiveGUID[i])
+                if (GlaiveGUID[i])
                 {
-                    if(GETUNIT(Glaive, GlaiveGUID[i]))
+                    if (GETUNIT(Glaive, GlaiveGUID[i]))
                     {
                         Glaive->SetVisibility(VISIBILITY_OFF);
                         Glaive->setDeathState(JUST_DIED); // Despawn the Glaive
@@ -633,7 +633,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
         case 10://attack
             DoResetThreat();
             m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_SELECTABLE);
-            m_creature->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE );
+            m_creature->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
             EnterPhase(PHASE_NORMAL_2);
             break;
         default:
@@ -644,20 +644,20 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
 
     void HandleTransformSequence()
     {
-        if(DemonTransformation[TransformCount].unaura)
+        if (DemonTransformation[TransformCount].unaura)
             m_creature->RemoveAurasDueToSpell(DemonTransformation[TransformCount].unaura);
 
-        if(DemonTransformation[TransformCount].aura)
+        if (DemonTransformation[TransformCount].aura)
             DoCast(m_creature, DemonTransformation[TransformCount].aura, true);
 
-        if(DemonTransformation[TransformCount].displayid)
+        if (DemonTransformation[TransformCount].displayid)
             m_creature->SetDisplayId(DemonTransformation[TransformCount].displayid); // It's morphin time!
 
-        if(DemonTransformation[TransformCount].equip)
+        if (DemonTransformation[TransformCount].equip)
         {
             // Requip warglaives if needed
             SetEquipmentSlots(false, EQUIP_ID_MAIN_HAND, EQUIP_ID_OFF_HAND, EQUIP_NO_CHANGE);
-            m_creature->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE );
+            m_creature->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
         }
         else
         {
@@ -677,7 +677,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
             DoResetThreat();
             break;
         case 9:
-            if(MaievGUID)
+            if (MaievGUID)
                 EnterPhase(PHASE_NORMAL_MAIEV); // Depending on whether we summoned Maiev, we switch to either phase 5 or 3
             else
                 EnterPhase(PHASE_NORMAL_2);
@@ -685,23 +685,23 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
         default:
             break;
         }
-        if(Phase == PHASE_TRANSFORM_SEQUENCE)
+        if (Phase == PHASE_TRANSFORM_SEQUENCE)
             Timer[EVENT_TRANSFORM_SEQUENCE] = DemonTransformation[TransformCount].timer;
         TransformCount++;
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if((!UpdateVictim()) && Phase < PHASE_TALK_SEQUENCE)
+        if ((!UpdateVictim()) && Phase < PHASE_TALK_SEQUENCE)
             return;
 
         Event = EVENT_NULL;
         for(uint32 i = 1; i <= MaxTimer[Phase]; ++i)
         {
-            if(Timer[i]) // Event is enabled
-                if(Timer[i] <= diff)
+            if (Timer[i]) // Event is enabled
+                if (Timer[i] <= diff)
                 {
-                    if(!Event) // No event with higher priority
+                    if (!Event) // No event with higher priority
                         Event = (EventIllidan)i;
                 }
                 else Timer[i] -= diff;
@@ -710,40 +710,40 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
         switch(Phase)
         {
         case PHASE_NORMAL:
-            if(HPPCT(m_creature) < 65)
+            if (HPPCT(m_creature) < 65)
                 EnterPhase(PHASE_FLIGHT_SEQUENCE);
             break;
 
         case PHASE_NORMAL_2:
-            if(HPPCT(m_creature) < 30)
+            if (HPPCT(m_creature) < 30)
                 EnterPhase(PHASE_TALK_SEQUENCE);
             break;
 
         case PHASE_NORMAL_MAIEV:
-            if(HPPCT(m_creature) < 1)
+            if (HPPCT(m_creature) < 1)
                 EnterPhase(PHASE_TALK_SEQUENCE);
             break;
 
         case PHASE_TALK_SEQUENCE:
-            if(Event == EVENT_TALK_SEQUENCE)
+            if (Event == EVENT_TALK_SEQUENCE)
                 HandleTalkSequence();
             break;
 
         case PHASE_FLIGHT_SEQUENCE:
-            if(Event == EVENT_FLIGHT_SEQUENCE)
+            if (Event == EVENT_FLIGHT_SEQUENCE)
                 HandleFlightSequence();
             break;
 
         case PHASE_TRANSFORM_SEQUENCE:
-            if(Event == EVENT_TRANSFORM_SEQUENCE)
+            if (Event == EVENT_TRANSFORM_SEQUENCE)
                 HandleTransformSequence();
             break;
         }
 
-        if(m_creature->IsNonMeleeSpellCasted(false))
+        if (m_creature->IsNonMeleeSpellCasted(false))
             return;
 
-        if(Phase == PHASE_NORMAL || Phase == PHASE_NORMAL_2 || Phase == PHASE_NORMAL_MAIEV && !m_creature->HasAura(SPELL_CAGED))
+        if (Phase == PHASE_NORMAL || Phase == PHASE_NORMAL_2 || Phase == PHASE_NORMAL_MAIEV && !m_creature->HasAura(SPELL_CAGED))
         {
             switch(Event)
             {
@@ -760,9 +760,9 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
                     uint32 random = rand()%4;
                     char* yell = RandomTaunts[random].text;
                     uint32 soundid = RandomTaunts[random].sound;
-                    if(yell)
+                    if (yell)
                         DoYell(yell, LANG_UNIVERSAL, NULL);
-                    if(soundid)
+                    if (soundid)
                         DoPlaySoundToSet(m_creature, soundid);
                 }
                 Timer[EVENT_TAUNT] = 25000 + rand()%10000;
@@ -780,7 +780,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
 
             case EVENT_PARASITIC_SHADOWFIEND:
                 {
-                    if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true))
+                    if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true))
                         m_creature->CastSpell(target, SPELL_PARASITIC_SHADOWFIEND, true);
                     Timer[EVENT_PARASITIC_SHADOWFIEND] = 35000 + rand()%10000;
                 }break;
@@ -816,7 +816,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
             DoMeleeAttackIfReady();
         }
 
-        if(Phase == PHASE_FLIGHT)
+        if (Phase == PHASE_FLIGHT)
         {
             switch(Event)
             {
@@ -839,7 +839,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
                 Phase = PHASE_FLIGHT_SEQUENCE;
                 Timer[EVENT_FLIGHT_SEQUENCE] = 0;//do not start Event when changing hover point
                 HoverPoint += (rand()%3 + 1);
-                if(HoverPoint > 3)
+                if (HoverPoint > 3)
                     HoverPoint -= 4;
                 m_creature->GetMotionMaster()->MovePoint(0, HoverPosition[HoverPoint].x, HoverPosition[HoverPoint].y, HoverPosition[HoverPoint].z);
                 break;
@@ -849,13 +849,13 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
             }
         }
 
-        if(Phase == PHASE_DEMON)
+        if (Phase == PHASE_DEMON)
         {
             switch(Event)
             {
             case EVENT_SHADOW_BLAST:
                 m_creature->GetMotionMaster()->Clear(false);
-                if(!m_creature->IsWithinDistInMap(m_creature->getVictim(), 50)||!m_creature->IsWithinLOSInMap(m_creature->getVictim()))
+                if (!m_creature->IsWithinDistInMap(m_creature->getVictim(), 50)||!m_creature->IsWithinLOSInMap(m_creature->getVictim()))
                     m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), 30);
                 else
                     m_creature->GetMotionMaster()->MoveIdle();
@@ -903,7 +903,7 @@ struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI
     void ChargeCheck()
     {
         Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0, 200, false);
-        if(target && (!m_creature->IsWithinCombatRange(target, FLAME_CHARGE_DISTANCE)))
+        if (target && (!m_creature->IsWithinCombatRange(target, FLAME_CHARGE_DISTANCE)))
         {
             m_creature->AddThreat(target, 5000000.0f);
             AttackStart(target);
@@ -914,21 +914,21 @@ struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI
 
     void EnrageCheck()
     {
-        if(GETUNIT(Glaive, GlaiveGUID))
+        if (GETUNIT(Glaive, GlaiveGUID))
         {
-            if(!m_creature->IsWithinDistInMap(Glaive, FLAME_ENRAGE_DISTANCE))
+            if (!m_creature->IsWithinDistInMap(Glaive, FLAME_ENRAGE_DISTANCE))
             {
                 Glaive->InterruptNonMeleeSpells(true);
                 DoCast(m_creature, SPELL_FLAME_ENRAGE, true);
                 DoResetThreat();
                 Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                if(target && target->isAlive())
+                if (target && target->isAlive())
                 {
                     m_creature->AddThreat(m_creature->getVictim(), 5000000.0f);
                     AttackStart(m_creature->getVictim());
                 }
             }
-            else if(!m_creature->HasAura(SPELL_AZZINOTH_CHANNEL))
+            else if (!m_creature->HasAura(SPELL_AZZINOTH_CHANNEL))
             {
                 Glaive->CastSpell(m_creature, SPELL_AZZINOTH_CHANNEL, false);
                 m_creature->RemoveAurasDueToSpell(SPELL_FLAME_ENRAGE);
@@ -940,10 +940,10 @@ struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(FlameBlastTimer < diff)
+        if (FlameBlastTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_BLAZE_SUMMON, true); //appear at victim
             DoCast(m_creature->getVictim(), SPELL_FLAME_BLAST);
@@ -951,7 +951,7 @@ struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI
             DoZoneInCombat(); //in case someone is revived
         }else FlameBlastTimer -= diff;
 
-        if(CheckTimer < diff)
+        if (CheckTimer < diff)
         {
             ChargeCheck();
             EnrageCheck();
@@ -990,7 +990,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, NOT_STARTED);
 
@@ -1046,7 +1046,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(damage > m_creature->GetHealth() || done_by->GetGUID() != IllidanGUID)
+        if (damage > m_creature->GetHealth() || done_by->GetGUID() != IllidanGUID)
             damage = 0;
     }
 
@@ -1057,7 +1057,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
         for(std::list<HostilReference*>::iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
         {
             Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid());
-            if(pUnit && pUnit->GetEntry() == ILLIDARI_ELITE)
+            if (pUnit && pUnit->GetEntry() == ILLIDARI_ELITE)
                 eliteList.push_back(pUnit);
         }
         for(std::vector<Unit*>::iterator itr = eliteList.begin(); itr != eliteList.end(); ++itr)
@@ -1067,7 +1067,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
 
     void BeginTalk()
     {
-        if(!pInstance)
+        if (!pInstance)
             return;
             
         pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, IN_PROGRESS);
@@ -1075,7 +1075,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
         for(uint8 i = 0; i < 2; ++i)
             pInstance->HandleGameObject(DoorGUID[i], false);
 
-        if(GETCRE(Illidan, IllidanGUID))
+        if (GETCRE(Illidan, IllidanGUID))
         {
             Illidan->RemoveAurasDueToSpell(SPELL_KNEEL);
             m_creature->SetInFront(Illidan);
@@ -1092,12 +1092,12 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
         m_creature->setActive(true);
 
         float x, y, z;
-        if(GETGO(Gate, GateGUID))
+        if (GETGO(Gate, GateGUID))
             Gate->GetPosition(x, y, z);
         else
             return;//if door not spawned, don't crash server
 
-        if(Creature* Channel = m_creature->SummonCreature(ILLIDAN_DOOR_TRIGGER, x, y, z+5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000))
+        if (Creature* Channel = m_creature->SummonCreature(ILLIDAN_DOOR_TRIGGER, x, y, z+5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000))
         {
             ChannelGUID = Channel->GetGUID();
             Channel->SetDisplayId(11686); // Invisible but spell visuals can still be seen.
@@ -1106,7 +1106,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
         }
 
         for(uint8 i = 0; i < 2; ++i)
-            if(Creature* Spirit = m_creature->SummonCreature(i ? SPIRIT_OF_OLUM : SPIRIT_OF_UDALO, SpiritSpawns[i].x, SpiritSpawns[i].y, SpiritSpawns[i].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000))
+            if (Creature* Spirit = m_creature->SummonCreature(i ? SPIRIT_OF_OLUM : SPIRIT_OF_UDALO, SpiritSpawns[i].x, SpiritSpawns[i].y, SpiritSpawns[i].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000))
             {
                 Spirit->SetVisibility(VISIBILITY_OFF);
                 SpiritGUID[i] = Spirit->GetGUID();
@@ -1122,7 +1122,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
 
     void EnterPhase(PhaseAkama NextPhase)
     {
-        if(!pInstance)  return;
+        if (!pInstance)  return;
         switch(NextPhase)
         {
         case PHASE_CHANNEL:
@@ -1131,11 +1131,11 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
             ChannelCount = 0;
             break;
         case PHASE_WALK:
-            if(Phase == PHASE_CHANNEL)
+            if (Phase == PHASE_CHANNEL)
                 WalkCount = 0;
-            else if(Phase == PHASE_TALK)
+            else if (Phase == PHASE_TALK)
             {
-                if(GETCRE(Illidan, IllidanGUID))
+                if (GETCRE(Illidan, IllidanGUID))
                     CAST_AI(boss_illidan_stormrageAI, Illidan->AI())->DeleteFromThreatList(m_creature->GetGUID());
                 EnterEvadeMode();
                 m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -1145,19 +1145,19 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
             Timer = 0;
             break;
         case PHASE_TALK:
-            if(Phase == PHASE_WALK)
+            if (Phase == PHASE_WALK)
             {
                 BeginTalk();
                 Timer = 0;
             }
-            else if(Phase == PHASE_FIGHT_ILLIDAN)
+            else if (Phase == PHASE_FIGHT_ILLIDAN)
             {
                 Timer = 1;
                 TalkCount = 0;
             }
             break;
         case PHASE_FIGHT_ILLIDAN:
-            if(GETUNIT(Illidan, IllidanGUID))
+            if (GETUNIT(Illidan, IllidanGUID))
             {
                 m_creature->AddThreat(Illidan, 10000000.0f);
                 m_creature->GetMotionMaster()->MoveChase(Illidan);
@@ -1187,7 +1187,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
         switch(TalkCount)
         {
         case 0:
-            if(GETCRE(Illidan, IllidanGUID))
+            if (GETCRE(Illidan, IllidanGUID))
             {
                 CAST_AI(boss_illidan_stormrageAI, Illidan->AI())->Timer[EVENT_TAUNT] += 30000;
                 Illidan->MonsterYell(SAY_AKAMA_MINION, LANG_UNIVERSAL, 0);
@@ -1210,12 +1210,12 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
     void HandleChannelSequence()
     {
         Unit* Channel, *Spirit[2];
-        if(ChannelCount <= 5)
+        if (ChannelCount <= 5)
         {
             Channel = Unit::GetUnit((*m_creature), ChannelGUID);
             Spirit[0] = Unit::GetUnit((*m_creature), SpiritGUID[0]);
             Spirit[1] = Unit::GetUnit((*m_creature), SpiritGUID[1]);
-            if(!Channel || !Spirit[0] || !Spirit[1])
+            if (!Channel || !Spirit[0] || !Spirit[1])
                 return;
         }
 
@@ -1273,7 +1273,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
                 pInstance->HandleGameObject(DoorGUID[i], true);
             break;
         case 8:
-            if(Phase == PHASE_WALK)
+            if (Phase == PHASE_WALK)
                 EnterPhase(PHASE_TALK);
             else
                 EnterPhase(PHASE_FIGHT_ILLIDAN);
@@ -1283,7 +1283,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
             break;
         }
 
-        if(Phase == PHASE_WALK)
+        if (Phase == PHASE_WALK)
         {
             Timer = 0;
             WalkCount++;
@@ -1294,14 +1294,14 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         Event = false;
-        if(Timer)
+        if (Timer)
         {
-            if(Timer <= diff)
+            if (Timer <= diff)
                 Event = true;
             else Timer -= diff;
         }
 
-        if(Event)
+        if (Event)
         {
             switch(Phase)
             {
@@ -1318,7 +1318,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
             case PHASE_FIGHT_ILLIDAN:
                 {
                     GETUNIT(Illidan, IllidanGUID);
-                    if(Illidan && HPPCT(Illidan) < 90)
+                    if (Illidan && HPPCT(Illidan) < 90)
                         EnterPhase(PHASE_TALK);
                     else
                     {
@@ -1332,7 +1332,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
                     m_creature->GetPosition(x, y, z);
                     Creature* Elite = m_creature->SummonCreature(ILLIDARI_ELITE, x+rand()%10, y+rand()%10, z, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 30000);
                     //Creature* Elite = m_creature->SummonCreature(ILLIDARI_ELITE, x, y, z, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 30000);
-                    if(Elite)
+                    if (Elite)
                     {
                         Elite->AI()->AttackStart(m_creature);
                         Elite->AddThreat(m_creature, 1000000.0f);
@@ -1341,7 +1341,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
                     }
                     Timer = 10000 + rand()%6000;
                     GETUNIT(Illidan, IllidanGUID);
-                    if(Illidan && HPPCT(Illidan) < 10)
+                    if (Illidan && HPPCT(Illidan) < 10)
                         EnterPhase(PHASE_RETURN);
                 }
                 break;
@@ -1350,10 +1350,10 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
             }
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 20)
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 20)
             DoCast(m_creature, SPELL_HEALING_POTION);
 
         DoMeleeAttackIfReady();
@@ -1391,29 +1391,29 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(done_by->GetGUID() != IllidanGUID )
+        if (done_by->GetGUID() != IllidanGUID)
             damage = 0;
         else
         {
             GETUNIT(Illidan, IllidanGUID);
-            if(Illidan && Illidan->getVictim() == m_creature)
+            if (Illidan && Illidan->getVictim() == m_creature)
                 damage = m_creature->GetMaxHealth()/10;
-            if(damage >= m_creature->GetHealth())
+            if (damage >= m_creature->GetHealth())
                 damage = 0;
         }
     }
 
     void AttackStart(Unit *who)
     {
-        if(!who || Timer[EVENT_MAIEV_STEALTH])
+        if (!who || Timer[EVENT_MAIEV_STEALTH])
             return;
 
-        if(Phase == PHASE_TALK_SEQUENCE)
+        if (Phase == PHASE_TALK_SEQUENCE)
             AttackStartNoMove(who);
-        else if(Phase == PHASE_DEMON || Phase == PHASE_TRANSFORM_SEQUENCE )
+        else if (Phase == PHASE_DEMON || Phase == PHASE_TRANSFORM_SEQUENCE)
         {
             GETUNIT(Illidan, IllidanGUID);
-            if(Illidan && m_creature->IsWithinDistInMap(Illidan, 25))
+            if (Illidan && m_creature->IsWithinDistInMap(Illidan, 25))
                 BlinkToPlayer();//Do not let dread aura hurt her.
             AttackStartNoMove(who);
         }
@@ -1423,7 +1423,7 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
 
     void DoAction(const int32 param)
     {
-        if(param > PHASE_ILLIDAN_NULL && param < PHASE_ILLIDAN_MAX)
+        if (param > PHASE_ILLIDAN_NULL && param < PHASE_ILLIDAN_MAX)
             EnterPhase(PhaseIllidan(param));
     }
 
@@ -1432,7 +1432,7 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
         switch(NextPhase)
         {
         case PHASE_TALK_SEQUENCE:
-            if(Timer[EVENT_MAIEV_STEALTH])
+            if (Timer[EVENT_MAIEV_STEALTH])
             {
                 m_creature->SetHealth(m_creature->GetMaxHealth());
                 m_creature->SetVisibility(VISIBILITY_ON);
@@ -1459,7 +1459,7 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
         default:
             break;
         }
-        if(Timer[EVENT_MAIEV_STEALTH])
+        if (Timer[EVENT_MAIEV_STEALTH])
             MaxTimer = 1;
         Phase = NextPhase;
     }
@@ -1475,11 +1475,11 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
 
     void BlinkToPlayer()
     {
-        if(GETCRE(Illidan, IllidanGUID))
+        if (GETCRE(Illidan, IllidanGUID))
         {
             Unit* target = CAST_AI(boss_illidan_stormrageAI, Illidan->AI())->SelectUnit(SELECT_TARGET_RANDOM, 0);
 
-            if(!target || !m_creature->IsWithinDistInMap(target, 80) || Illidan->IsWithinDistInMap(target, 20))
+            if (!target || !m_creature->IsWithinDistInMap(target, 80) || Illidan->IsWithinDistInMap(target, 20))
             {
                 uint8 pos = rand()%4;
                 BlinkTo(HoverPosition[pos].x, HoverPosition[pos].y, HoverPosition[pos].z);
@@ -1495,15 +1495,15 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if((!UpdateVictim())
+        if ((!UpdateVictim())
             && !Timer[EVENT_MAIEV_STEALTH])
             return;
 
         Event = EVENT_MAIEV_NULL;
         for(uint8 i = 1; i <= MaxTimer; ++i)
-            if(Timer[i])
+            if (Timer[i])
             {
-                if(Timer[i] <= diff)
+                if (Timer[i] <= diff)
                     Event = (EventMaiev)i;
                 else Timer[i] -= diff;
             }
@@ -1533,7 +1533,7 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
                 Timer[EVENT_MAIEV_SHADOW_STRIKE] = 60000;
                 break;
             case EVENT_MAIEV_TRAP:
-                if(Phase == PHASE_NORMAL_MAIEV)
+                if (Phase == PHASE_NORMAL_MAIEV)
                 {
                     BlinkToPlayer();
                     DoCast(m_creature, SPELL_CAGE_TRAP_SUMMON);
@@ -1541,7 +1541,7 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
                 }
                 else
                 {
-                    if(!m_creature->IsWithinDistInMap(m_creature->getVictim(), 40))
+                    if (!m_creature->IsWithinDistInMap(m_creature->getVictim(), 40))
                         m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), 30);
                     DoCast(m_creature->getVictim(), SPELL_THROW_DAGGER);
                     Timer[EVENT_MAIEV_THROW_DAGGER] = 2000;
@@ -1551,37 +1551,37 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
                 break;
             }
 
-            if(m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 50)
+            if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 50)
             {
                 m_creature->SetVisibility(VISIBILITY_OFF);
                 m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-                if(GETCRE(Illidan, IllidanGUID))
+                if (GETCRE(Illidan, IllidanGUID))
                     CAST_AI(boss_illidan_stormrageAI, Illidan->AI())->DeleteFromThreatList(m_creature->GetGUID());
                 m_creature->AttackStop();
                 Timer[EVENT_MAIEV_STEALTH] = 60000; //reappear after 1 minute
                 MaxTimer = 1;
             }
 
-            if(Phase == PHASE_NORMAL_MAIEV)
+            if (Phase == PHASE_NORMAL_MAIEV)
                 DoMeleeAttackIfReady();
     }
 };
 
 
-bool GossipSelect_npc_akama_at_illidan(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_akama_at_illidan(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if(action == GOSSIP_ACTION_INFO_DEF) // Time to begin the Event
+    if (action == GOSSIP_ACTION_INFO_DEF) // Time to begin the Event
     {
-        player->CLOSE_GOSSIP_MENU();
+        pPlayer->CLOSE_GOSSIP_MENU();
         CAST_AI(npc_akama_illidanAI, _Creature->AI())->EnterPhase(PHASE_CHANNEL);
     }
     return true;
 }
 
-bool GossipHello_npc_akama_at_illidan(Player *player, Creature *_Creature)
+bool GossipHello_npc_akama_at_illidan(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
-    player->SEND_GOSSIP_MENU(10465, _Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    pPlayer->SEND_GOSSIP_MENU(10465, _Creature->GetGUID());
 
     return true;
 }
@@ -1612,21 +1612,21 @@ struct TRINITY_DLL_DECL cage_trap_triggerAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(!Active)
+        if (!Active)
             return;
 
-        if(who && (who->GetTypeId() != TYPEID_PLAYER))
+        if (who && (who->GetTypeId() != TYPEID_PLAYER))
         {
-            if(who->GetEntry() == ILLIDAN_STORMRAGE) // Check if who is Illidan
+            if (who->GetEntry() == ILLIDAN_STORMRAGE) // Check if who is Illidan
             {
-                if(!IllidanGUID && m_creature->IsWithinDistInMap(who, 3) && (!who->HasAura(SPELL_CAGED)))
+                if (!IllidanGUID && m_creature->IsWithinDistInMap(who, 3) && (!who->HasAura(SPELL_CAGED)))
                 {
                     IllidanGUID = who->GetGUID();
                     who->CastSpell(who, SPELL_CAGED, true);
                     DespawnTimer = 5000;
-                    if(who->HasAura(SPELL_ENRAGE))
+                    if (who->HasAura(SPELL_ENRAGE))
                         who->RemoveAurasDueToSpell(SPELL_ENRAGE); // Dispel his enrage
-                    //if(GameObject* CageTrap = pInstance->instance->GetGameObject(pInstance->GetData64(CageTrapGUID)))
+                    //if (GameObject* CageTrap = pInstance->instance->GetGameObject(pInstance->GetData64(CageTrapGUID)))
                     //    CageTrap->SetLootState(GO_JUST_DEACTIVATED);
                 }
             }
@@ -1635,14 +1635,14 @@ struct TRINITY_DLL_DECL cage_trap_triggerAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(DespawnTimer)
-            if(DespawnTimer < diff)
+        if (DespawnTimer)
+            if (DespawnTimer < diff)
                 m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
             else DespawnTimer -= diff;
 
-            //if(IllidanGUID && !SummonedBeams)
+            //if (IllidanGUID && !SummonedBeams)
             //{
-            //    if(Unit* Illidan = Unit::GetUnit(*m_creature, IllidanGUID)
+            //    if (Unit* Illidan = Unit::GetUnit(*m_creature, IllidanGUID)
             //    {
             //        //TODO: Find proper spells and properly apply 'caged' Illidan effect
             //    }
@@ -1656,7 +1656,7 @@ bool GOHello_cage_trap(Player* pPlayer, GameObject* pGo)
     pPlayer->GetPosition(x, y, z);
 
     // Grid search for nearest live creature of entry 23304 within 10 yards
-    if(Creature* pTrigger = pGo->FindNearestCreature(23304, 10.0f))
+    if (Creature* pTrigger = pGo->FindNearestCreature(23304, 10.0f))
         CAST_AI(cage_trap_triggerAI, pTrigger->AI())->Active = true;
     pGo->SetGoState(GO_STATE_ACTIVE);
     return true;
@@ -1678,17 +1678,17 @@ struct TRINITY_DLL_DECL shadow_demonAI : public ScriptedAI
 
     void JustDied(Unit *killer)
     {
-        if(Unit* target = Unit::GetUnit((*m_creature), TargetGUID))
+        if (Unit* target = Unit::GetUnit((*m_creature), TargetGUID))
             target->RemoveAurasDueToSpell(SPELL_PARALYZE);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim()) return;
+        if (!UpdateVictim()) return;
 
-        if(m_creature->getVictim()->GetTypeId() != TYPEID_PLAYER) return; // Only cast the below on players.
+        if (m_creature->getVictim()->GetTypeId() != TYPEID_PLAYER) return; // Only cast the below on players.
 
-        if(!m_creature->getVictim()->HasAura(SPELL_PARALYZE))
+        if (!m_creature->getVictim()->HasAura(SPELL_PARALYZE))
         {
             TargetGUID = m_creature->getVictim()->GetGUID();
             m_creature->AddThreat(m_creature->getVictim(), 10000000.0f);
@@ -1696,7 +1696,7 @@ struct TRINITY_DLL_DECL shadow_demonAI : public ScriptedAI
             DoCast(m_creature->getVictim(), SPELL_PARALYZE, true);
         }
         // Kill our target if we're very close.
-        if(m_creature->IsWithinDistInMap(m_creature->getVictim(), 3))
+        if (m_creature->IsWithinDistInMap(m_creature->getVictim(), 3))
             DoCast(m_creature->getVictim(), SPELL_CONSUME_SOUL);
     }
 };
@@ -1715,7 +1715,7 @@ struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             IllidanGUID = pInstance->GetData64(DATA_ILLIDANSTORMRAGE);
         else
             IllidanGUID = 0;
@@ -1728,13 +1728,13 @@ struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI
 
     void DoMeleeAttackIfReady()
     {
-        if( m_creature->isAttackReady() && m_creature->IsWithinMeleeRange(m_creature->getVictim()))
+        if (m_creature->isAttackReady() && m_creature->IsWithinMeleeRange(m_creature->getVictim()))
         {
-            if(!m_creature->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND)
+            if (!m_creature->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND)
                 && !m_creature->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND2))
             {
-                if(Creature* illidan = Unit::GetCreature((*m_creature),IllidanGUID))//summon only in 1. phase
-                    if(CAST_AI(boss_illidan_stormrageAI, illidan->AI())->Phase == PHASE_NORMAL)
+                if (Creature* illidan = Unit::GetCreature((*m_creature),IllidanGUID))//summon only in 1. phase
+                    if (CAST_AI(boss_illidan_stormrageAI, illidan->AI())->Phase == PHASE_NORMAL)
                         m_creature->CastSpell(m_creature->getVictim(), SPELL_PARASITIC_SHADOWFIEND2, true, 0, 0, IllidanGUID); //do not stack
             }
             m_creature->AttackerStateUpdate(m_creature->getVictim());
@@ -1744,9 +1744,9 @@ struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->getVictim())
+        if (!m_creature->getVictim())
         {
-            if(Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true))
+            if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true))
                 AttackStart(target);
             else
             {
@@ -1756,10 +1756,10 @@ struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI
             }
         }
 
-        if(CheckTimer < diff)
+        if (CheckTimer < diff)
         {
             GETUNIT(Illidan, IllidanGUID);
-            if(!Illidan || CAST_CRE(Illidan)->IsInEvadeMode())
+            if (!Illidan || CAST_CRE(Illidan)->IsInEvadeMode())
             {
                 m_creature->SetVisibility(VISIBILITY_OFF);
                 m_creature->setDeathState(JUST_DIED);
@@ -1777,21 +1777,21 @@ struct TRINITY_DLL_DECL blade_of_azzinothAI : public NullCreatureAI
 
     void SpellHit(Unit *caster, const SpellEntry *spell)
     {
-        if(spell->Id == SPELL_THROW_GLAIVE2 || spell->Id == SPELL_THROW_GLAIVE)
+        if (spell->Id == SPELL_THROW_GLAIVE2 || spell->Id == SPELL_THROW_GLAIVE)
             me->SetDisplayId(21431);//appear when hit by Illidan's glaive
     }
 };
 
 void boss_illidan_stormrageAI::Reset()
 {
-    if(pInstance)
+    if (pInstance)
         pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, NOT_STARTED);
 
-    if(AkamaGUID)
+    if (AkamaGUID)
     {
-        if(GETCRE(Akama, AkamaGUID))
+        if (GETCRE(Akama, AkamaGUID))
         {
-            if(!Akama->isAlive())
+            if (!Akama->isAlive())
                 Akama->Respawn();
             else
             {
@@ -1836,21 +1836,21 @@ void boss_illidan_stormrageAI::JustSummoned(Creature* summon)
     {
     case PARASITIC_SHADOWFIEND:
         {
-            if(Phase == PHASE_TALK_SEQUENCE)
+            if (Phase == PHASE_TALK_SEQUENCE)
             {
                 summon->SetVisibility(VISIBILITY_OFF);
                 summon->setDeathState(JUST_DIED);
                 return;
             }
             Unit *target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 999, true);
-            if(!target || target->HasAura(SPELL_PARASITIC_SHADOWFIEND)
+            if (!target || target->HasAura(SPELL_PARASITIC_SHADOWFIEND)
                 || target->HasAura(SPELL_PARASITIC_SHADOWFIEND2))
                 target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true);
-            if(target)
+            if (target)
                 summon->AI()->AttackStart(target);
         }break;
     case SHADOW_DEMON:
-        if(Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) // only on players.
+        if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true)) // only on players.
         {
             summon->AddThreat(target, 5000000.0f);
             summon->AI()->AttackStart(target);
@@ -1882,11 +1882,11 @@ void boss_illidan_stormrageAI::HandleTalkSequence()
     case 8:
         // Equip our warglaives!
         SetEquipmentSlots(false, EQUIP_ID_MAIN_HAND, EQUIP_ID_OFF_HAND, EQUIP_NO_CHANGE);
-        m_creature->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE );
+        m_creature->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
         m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
         break;
     case 9:
-        if(GETCRE(Akama, AkamaGUID))
+        if (GETCRE(Akama, AkamaGUID))
         {
             m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_SELECTABLE);
             m_creature->AddThreat(Akama, 100.0f);
@@ -1898,7 +1898,7 @@ void boss_illidan_stormrageAI::HandleTalkSequence()
         SummonMaiev();
         break;
     case 11:
-        if(GETUNIT(Maiev, MaievGUID))
+        if (GETUNIT(Maiev, MaievGUID))
         {
             Maiev->SetVisibility(VISIBILITY_ON); // Maiev is now visible
             Maiev->CastSpell(Maiev, SPELL_TELEPORT_VISUAL, true); // onoz she looks like she teleported!
@@ -1908,7 +1908,7 @@ void boss_illidan_stormrageAI::HandleTalkSequence()
             m_creature->GetMotionMaster()->MoveIdle();
         }break;
     case 14:
-        if(GETCRE(Maiev, MaievGUID))
+        if (GETCRE(Maiev, MaievGUID))
         {
             m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_SELECTABLE);
             Maiev->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_SELECTABLE);
@@ -1921,9 +1921,9 @@ void boss_illidan_stormrageAI::HandleTalkSequence()
         Summons.DespawnAll();
         break;
     case 17:
-        if(GETUNIT(Akama, AkamaGUID))
+        if (GETUNIT(Akama, AkamaGUID))
         {
-            if(!m_creature->IsWithinDistInMap(Akama, 15))
+            if (!m_creature->IsWithinDistInMap(Akama, 15))
             {
                 float x, y, z;
                 m_creature->GetPosition(x, y, z);
@@ -1937,7 +1937,7 @@ void boss_illidan_stormrageAI::HandleTalkSequence()
         }
         break;
     case 19: // Make Maiev leave
-        if(GETUNIT(Maiev, MaievGUID))
+        if (GETUNIT(Maiev, MaievGUID))
         {
             Maiev->CastSpell(Maiev, SPELL_TELEPORT_VISUAL, true);
             Maiev->setDeathState(JUST_DIED);
@@ -1950,7 +1950,7 @@ void boss_illidan_stormrageAI::HandleTalkSequence()
     default:
         break;
     }
-    if(Phase == PHASE_TALK_SEQUENCE)
+    if (Phase == PHASE_TALK_SEQUENCE)
         Talk(TalkCount); // This function does most of the talking
     TalkCount++;
 }
@@ -1983,7 +1983,7 @@ void boss_illidan_stormrageAI::CastEyeBlast()
     final.y = 2 * final.y - initial.y;
 
     Creature* Trigger = m_creature->SummonTrigger(initial.x, initial.y, initial.z, 0, 13000);
-    if(!Trigger) return;
+    if (!Trigger) return;
 
     Trigger->SetSpeed(MOVE_WALK, 3);
     Trigger->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
@@ -2001,10 +2001,10 @@ void boss_illidan_stormrageAI::SummonFlamesOfAzzinoth()
 
     for(uint8 i = 0; i < 2; ++i)
     {
-        if(GETUNIT(Glaive, GlaiveGUID[i]))
+        if (GETUNIT(Glaive, GlaiveGUID[i]))
         {
             Creature* Flame = m_creature->SummonCreature(FLAME_OF_AZZINOTH, GlaivePosition[i+2].x, GlaivePosition[i+2].y, GlaivePosition[i+2].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000);
-            if(Flame)
+            if (Flame)
             {
                 Flame->setFaction(m_creature->getFaction()); // Just in case the database has it as a different faction
                 Flame->SetMeleeDamageSchool(SPELL_SCHOOL_FIRE);
@@ -2020,7 +2020,7 @@ void boss_illidan_stormrageAI::SummonMaiev()
 {
     m_creature->CastSpell(m_creature, SPELL_SHADOW_PRISON, true);
     m_creature->CastSpell(m_creature, 40403, true);
-    if(!MaievGUID) // If Maiev cannot be summoned, reset the encounter and post some errors to the console.
+    if (!MaievGUID) // If Maiev cannot be summoned, reset the encounter and post some errors to the console.
     {
         EnterEvadeMode();
         DoTextEmote("is unable to summon Maiev Shadowsong and enter Phase 4. Resetting Encounter.", NULL);
@@ -2044,17 +2044,17 @@ void boss_illidan_stormrageAI::EnterPhase(PhaseIllidan NextPhase)
         Timer[EVENT_PARASITIC_SHADOWFIEND] = 25000;
         Timer[EVENT_PARASITE_CHECK] = 0;
         Timer[EVENT_DRAW_SOUL] = 30000;
-        if(NextPhase == PHASE_NORMAL)
+        if (NextPhase == PHASE_NORMAL)
             break;
         Timer[EVENT_AGONIZING_FLAMES] = 35000;
         Timer[EVENT_TRANSFORM_NORMAL] = 60000;
-        if(NextPhase == PHASE_NORMAL_2)
+        if (NextPhase == PHASE_NORMAL_2)
             break;
         Timer[EVENT_ENRAGE] = 30000 + rand()%10 * 1000;
         break;
     case PHASE_FLIGHT:
         Timer[EVENT_FIREBALL] = 1000;
-        if(!(rand()%4))
+        if (!(rand()%4))
             Timer[EVENT_DARK_BARRAGE] = 10000;
         Timer[EVENT_EYE_BLAST] = 10000 + rand()%15 * 1000;
         Timer[EVENT_MOVE_POINT] = 20000 + rand()%20 * 1000;
@@ -2075,7 +2075,7 @@ void boss_illidan_stormrageAI::EnterPhase(PhaseIllidan NextPhase)
         m_creature->AttackStop();
         break;
     case PHASE_FLIGHT_SEQUENCE:
-        if(Phase == PHASE_NORMAL) //lift off
+        if (Phase == PHASE_NORMAL) //lift off
         {
             FlightCount = 1;
             Timer[EVENT_FLIGHT_SEQUENCE] = 1;
@@ -2089,7 +2089,7 @@ void boss_illidan_stormrageAI::EnterPhase(PhaseIllidan NextPhase)
             Timer[EVENT_FLIGHT_SEQUENCE] = 2000;
         break;
     case PHASE_TRANSFORM_SEQUENCE:
-        if(Phase == PHASE_DEMON)
+        if (Phase == PHASE_DEMON)
             Timer[EVENT_TRANSFORM_SEQUENCE] = 500;
         else
         {
@@ -2104,10 +2104,10 @@ void boss_illidan_stormrageAI::EnterPhase(PhaseIllidan NextPhase)
     default:
         break;
     }
-    if(MaievGUID)
+    if (MaievGUID)
     {
         GETCRE(Maiev, MaievGUID);
-        if(Maiev && Maiev->isAlive())
+        if (Maiev && Maiev->isAlive())
             Maiev->AI()->DoAction(NextPhase);
     }
     Phase = NextPhase;
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp
index 8901c554f05..1936677539e 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp
@@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, NOT_STARTED);
 
         for(uint8 i = 0; i<3; ++i)
@@ -125,7 +125,7 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, IN_PROGRESS);
 
         DoZoneInCombat();
@@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
 
     void JustDied(Unit *victim)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, DONE);
 
         DoScriptText(SAY_DEATH, m_creature);
@@ -158,7 +158,7 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
         for(uint8 i = 0; i < 3; ++i)
         {
             Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 1);
-            if(pUnit && pUnit->isAlive() && (pUnit->GetTypeId() == TYPEID_PLAYER))
+            if (pUnit && pUnit->isAlive() && (pUnit->GetTypeId() == TYPEID_PLAYER))
             {
                 TargetGUID[i] = pUnit->GetGUID();
                 pUnit->CastSpell(pUnit, SPELL_TELEPORT_VISUAL, true);
@@ -169,10 +169,10 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 10) && !Enraged)
+        if (((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 10) && !Enraged)
         {
             Enraged = true;
             DoCast(m_creature, SPELL_ENRAGE, true);
@@ -180,10 +180,10 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
         }
 
         //Randomly cast one beam.
-        if(BeamTimer < diff)
+        if (BeamTimer < diff)
         {
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-            if(!target || !target->isAlive())
+            if (!target || !target->isAlive())
                 return;
 
             BeamTimer = 9000;
@@ -205,23 +205,23 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
             }
             BeamCount++;
             uint32 Beam = CurrentBeam;
-            if(BeamCount > 3)
+            if (BeamCount > 3)
                 while(CurrentBeam == Beam)
                     CurrentBeam = rand()%3;
 
         }else BeamTimer -= diff;
 
         // Random Prismatic Shield every 15 seconds.
-        if(PrismaticShieldTimer < diff)
+        if (PrismaticShieldTimer < diff)
         {
             uint32 random = rand()%6;
-            if(PrismaticAuras[random])
+            if (PrismaticAuras[random])
                 DoCast(m_creature, PrismaticAuras[random]);
             PrismaticShieldTimer = 15000;
         }else PrismaticShieldTimer -= diff;
 
         // Select 3 random targets (can select same target more than once), teleport to a random location then make them cast explosions until they get away from each other.
-        if(FatalAttractionTimer < diff)
+        if (FatalAttractionTimer < diff)
         {
             ExplosionCount = 0;
 
@@ -236,18 +236,18 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
             FatalAttractionTimer = 40000 + rand()%31 * 1000;
         }else FatalAttractionTimer -= diff;
 
-        if(FatalAttractionExplodeTimer < diff)
+        if (FatalAttractionExplodeTimer < diff)
         {
             // Just make them explode three times... they're supposed to keep exploding while they are in range, but it'll take too much code. I'll try to think of an efficient way for it later.
-            if(ExplosionCount < 3)
+            if (ExplosionCount < 3)
             {
                 for(uint8 i = 0; i < 3; ++i)
                 {
                     Unit* pUnit = NULL;
-                    if(TargetGUID[i])
+                    if (TargetGUID[i])
                     {
                         pUnit = Unit::GetUnit((*m_creature), TargetGUID[i]);
-                        if(pUnit)
+                        if (pUnit)
                             pUnit->CastSpell(pUnit, SPELL_ATTRACTION, true);
                         TargetGUID[i] = 0;
                     }
@@ -263,28 +263,28 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
             }
         }else FatalAttractionExplodeTimer -= diff;
 
-        if(ShriekTimer < diff)
+        if (ShriekTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SILENCING_SHRIEK);
             ShriekTimer = 25000+rand()%10 * 1000;
         }else ShriekTimer -= diff;
 
-        if(SaberTimer < diff)
+        if (SaberTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SABER_LASH);
             SaberTimer = 25000+rand()%10 * 1000;
         }else SaberTimer -= diff;
 
         //Enrage
-        if(!m_creature->HasAura(SPELL_BERSERK))
-            if(EnrageTimer < diff)
+        if (!m_creature->HasAura(SPELL_BERSERK))
+            if (EnrageTimer < diff)
         {
             DoCast(m_creature, SPELL_BERSERK);
             DoScriptText(SAY_ENRAGE, m_creature);
         }else EnrageTimer -= diff;
 
         //Random taunts
-        if(RandomYellTimer < diff)
+        if (RandomYellTimer < diff)
         {
             switch(rand()%3)
             {
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp
index 98f060baff5..cc9a84cb5ca 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp
@@ -137,12 +137,12 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_RELIQUARYOFSOULSEVENT, NOT_STARTED);
 
-        if(EssenceGUID)
+        if (EssenceGUID)
         {
-            if(Creature* Essence = Unit::GetCreature(*m_creature, EssenceGUID))
+            if (Creature* Essence = Unit::GetCreature(*m_creature, EssenceGUID))
             {
                 Essence->ForcedDespawn();
             }
@@ -160,7 +160,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI
     {
         m_creature->AddThreat(who, 10000.0f);
         DoZoneInCombat();
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_RELIQUARYOFSOULSEVENT, IN_PROGRESS);
 
         Phase = 1;
@@ -174,8 +174,8 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI
         float x = Coords[random].x;
         float y = Coords[random].y;
         Creature* Soul = m_creature->SummonCreature(CREATURE_ENSLAVED_SOUL, x, y, m_creature->GetPositionZ(), m_creature->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0);
-        if(!Soul) return false;
-        if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+        if (!Soul) return false;
+        if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
         {
             CAST_AI(npc_enslaved_soulAI, Soul->AI())->ReliquaryGUID = m_creature->GetGUID();
             Soul->AI()->AttackStart(target);
@@ -205,33 +205,33 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI
 
     void JustDied(Unit* killer)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_RELIQUARYOFSOULSEVENT, DONE);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!Phase)
+        if (!Phase)
             return;
 
-        if(m_creature->getThreatManager().getThreatList().empty()) // Reset if event is begun and we don't have a threatlist
+        if (m_creature->getThreatManager().getThreatList().empty()) // Reset if event is begun and we don't have a threatlist
         {
             EnterEvadeMode();
             return;
         }
 
         Creature* Essence;
-        if(EssenceGUID)
+        if (EssenceGUID)
         {
             Essence = Unit::GetCreature(*m_creature, EssenceGUID);
-            if(!Essence)
+            if (!Essence)
             {
                 EnterEvadeMode();
                 return;
             }
         }
 
-        if(Timer < diff)
+        if (Timer < diff)
         {
             switch(Counter)
             {
@@ -248,7 +248,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI
                 break;
             case 2:
                 Timer = 5000;
-                if(Creature* Summon = DoSpawnCreature(23417+Phase, 0, 0, 0, 0, TEMPSUMMON_DEAD_DESPAWN, 0))
+                if (Creature* Summon = DoSpawnCreature(23417+Phase, 0, 0, 0, 0, TEMPSUMMON_DEAD_DESPAWN, 0))
                 {
                     m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_SUBMERGED);  // Ribs: open
                     Summon->AI()->AttackStart(SelectUnit(SELECT_TARGET_TOPAGGRO, 0));
@@ -258,15 +258,15 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI
                 break;
             case 3:
                 Timer = 1000;
-                if(Phase == 3)
+                if (Phase == 3)
                 {
-                    if(!Essence->isAlive())
+                    if (!Essence->isAlive())
                         m_creature->CastSpell(m_creature, 7, true);
                     else return;
                 }
                 else
                 {
-                    if(Essence->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+                    if (Essence->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
                     {
                         MergeThreatList(Essence);
                         Essence->RemoveAllAuras();
@@ -277,7 +277,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI
                 break;
             case 4:
                 Timer = 1500;
-                if(Essence->IsWithinDistInMap(m_creature, 10))
+                if (Essence->IsWithinDistInMap(m_creature, 10))
                 {
                     Essence->SetUInt32Value(UNIT_NPC_EMOTESTATE,374); //rotate and disappear
                     Timer = 2000;
@@ -293,7 +293,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI
                 }
                 break;
             case 5:
-                if(Phase == 1)
+                if (Phase == 1)
                 {
                     DoScriptText(SUFF_SAY_AFTER, Essence);
                 }
@@ -309,15 +309,15 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI
                 Timer = 3000;
                 break;
             case 6:
-                if(SoulCount < NUMBER_ENSLAVED_SOUL)
+                if (SoulCount < NUMBER_ENSLAVED_SOUL)
                 {
-                    if(SummonSoul())
+                    if (SummonSoul())
                         SoulCount++;
                     Timer = 500;
                     return;
                 }break;
             case 7:
-                if(SoulDeathCount >= SoulCount)
+                if (SoulDeathCount >= SoulCount)
                 {
                     Counter = 1;
                     Phase++;
@@ -357,7 +357,7 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(damage >= m_creature->GetHealth())
+        if (damage >= m_creature->GetHealth())
         {
             damage = 0;
             m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -368,7 +368,7 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(!m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+        if (!m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
             {
             DoScriptText(SUFF_SAY_FREED, m_creature);
             DoZoneInCombat();
@@ -392,22 +392,22 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI
     void CastFixate()
     {
         std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList();
-        if(m_threatlist.empty())
+        if (m_threatlist.empty())
             return; // No point continuing if empty threatlist.
         std::list<Unit*> targets;
         std::list<HostilReference*>::iterator itr = m_threatlist.begin();
-        for( ; itr != m_threatlist.end(); ++itr)
+        for(; itr != m_threatlist.end(); ++itr)
         {
             Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid());
-            if(pUnit && pUnit->isAlive() && (pUnit->GetTypeId() == TYPEID_PLAYER)) // Only alive players
+            if (pUnit && pUnit->isAlive() && (pUnit->GetTypeId() == TYPEID_PLAYER)) // Only alive players
                 targets.push_back(pUnit);
         }
-        if(targets.empty())
+        if (targets.empty())
             return; // No targets added for some reason. No point continuing.
         targets.sort(ObjectDistanceOrder(m_creature)); // Sort players by distance.
         targets.resize(1); // Only need closest target.
         Unit* target = targets.front(); // Get the first target.
-        if(target)
+        if (target)
             target->CastSpell(m_creature, SPELL_FIXATE_TAUNT, true);
         DoResetThreat();
         m_creature->AddThreat(target,1000000);
@@ -415,14 +415,14 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(m_creature->isInCombat())
+        if (m_creature->isInCombat())
         {
             //Supposed to be cast on nearest target
-            if(FixateTimer < diff)
+            if (FixateTimer < diff)
             {
                 CastFixate();
                 FixateTimer = 5000;
-                if(!(rand()%16))
+                if (!(rand()%16))
                 {
                     DoScriptText(SUFF_SAY_AGGRO, m_creature);
                 }
@@ -433,14 +433,14 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(EnrageTimer < diff)
+        if (EnrageTimer < diff)
         {
             DoCast(m_creature, SPELL_ENRAGE);
             EnrageTimer = 60000;
             DoScriptText(SUFF_EMOTE_ENRAGE, m_creature);
         }else EnrageTimer -= diff;
 
-        if(SoulDrainTimer < diff)
+        if (SoulDrainTimer < diff)
         {
             DoCast(SelectUnit(SELECT_TARGET_RANDOM,0), SPELL_SOUL_DRAIN);
             SoulDrainTimer = 60000;
@@ -468,10 +468,10 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(done_by == m_creature)
+        if (done_by == m_creature)
             return;
 
-        if(damage >= m_creature->GetHealth())
+        if (damage >= m_creature->GetHealth())
         {
             damage = 0;
             m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -486,10 +486,10 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI
 
     void SpellHit(Unit *caster, const SpellEntry *spell)
     {
-        if(m_creature->m_currentSpells[CURRENT_GENERIC_SPELL])
+        if (m_creature->m_currentSpells[CURRENT_GENERIC_SPELL])
             for(uint8 i = 0; i < 3; ++i)
-                if(spell->Effect[i] == SPELL_EFFECT_INTERRUPT_CAST)
-                    if(m_creature->m_currentSpells[CURRENT_GENERIC_SPELL]->m_spellInfo->Id == SPELL_SOUL_SHOCK
+                if (spell->Effect[i] == SPELL_EFFECT_INTERRUPT_CAST)
+                    if (m_creature->m_currentSpells[CURRENT_GENERIC_SPELL]->m_spellInfo->Id == SPELL_SOUL_SHOCK
                         || m_creature->m_currentSpells[CURRENT_GENERIC_SPELL]->m_spellInfo->Id == SPELL_DEADEN)
                         m_creature->InterruptSpell(CURRENT_GENERIC_SPELL, false);
     }
@@ -516,7 +516,7 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(RuneShieldTimer < diff)
+        if (RuneShieldTimer < diff)
         {
             m_creature->InterruptNonMeleeSpells(false);
             m_creature->CastSpell(m_creature, SPELL_RUNE_SHIELD, true);
@@ -525,18 +525,18 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI
             RuneShieldTimer = 60000;
         }else RuneShieldTimer -= diff;
 
-        if(SoulShockTimer < diff)
+        if (SoulShockTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SOUL_SHOCK);
             SoulShockTimer = 5000;
         }else SoulShockTimer -= diff;
 
-        if(DeadenTimer < diff)
+        if (DeadenTimer < diff)
         {
             m_creature->InterruptNonMeleeSpells(false);
             DoCast(m_creature->getVictim(), SPELL_DEADEN);
             DeadenTimer = 25000 + rand()%10000;
-            if(!(rand()%2))
+            if (!(rand()%2))
             {
                 DoScriptText(DESI_SAY_SPEC, m_creature);
             }
@@ -605,15 +605,15 @@ struct TRINITY_DLL_DECL boss_essence_of_angerAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(!CheckedAggro)
+        if (!CheckedAggro)
         {
             AggroTargetGUID = m_creature->getVictim()->GetGUID();
             CheckedAggro = true;
         }
 
-        if(CheckTankTimer < diff)
+        if (CheckTankTimer < diff)
         {
-            if(m_creature->getVictim()->GetGUID() != AggroTargetGUID)
+            if (m_creature->getVictim()->GetGUID() != AggroTargetGUID)
             {
                 DoScriptText(ANGER_SAY_BEFORE, m_creature);
                 DoCast(m_creature, SPELL_SELF_SEETHE, true);
@@ -622,17 +622,17 @@ struct TRINITY_DLL_DECL boss_essence_of_angerAI : public ScriptedAI
             CheckTankTimer = 2000;
         }else CheckTankTimer -= diff;
 
-        if(SoulScreamTimer < diff)
+        if (SoulScreamTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SOUL_SCREAM);
             SoulScreamTimer = 9000 + rand()%2000;
-            if(!(rand()%3))
+            if (!(rand()%3))
             {
                 DoScriptText(ANGER_SAY_SPEC, m_creature);
             }
         }else SoulScreamTimer -= diff;
 
-        if(SpiteTimer < diff)
+        if (SpiteTimer < diff)
         {
             DoCast(m_creature, SPELL_SPITE_TARGET);
             SpiteTimer = 30000;
@@ -645,10 +645,10 @@ struct TRINITY_DLL_DECL boss_essence_of_angerAI : public ScriptedAI
 
 void npc_enslaved_soulAI::JustDied(Unit *killer)
 {
-    if(ReliquaryGUID)
+    if (ReliquaryGUID)
     {
         Creature* Reliquary = (Unit::GetCreature((*m_creature), ReliquaryGUID));
-        if(Reliquary)
+        if (Reliquary)
             CAST_AI(boss_reliquary_of_soulsAI, Reliquary->AI())->SoulDeathCount++;
     }
     DoCast(m_creature, SPELL_SOUL_RELEASE, true);
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp
index 0cf81a8cd67..7907a411b46 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp
@@ -139,15 +139,15 @@ struct TRINITY_DLL_DECL mob_ashtongue_sorcererAI : public ScriptedAI
     void MoveInLineOfSight(Unit* who) {}
     void UpdateAI(const uint32 diff)
     {
-        if(StartBanishing)
+        if (StartBanishing)
             return;
 
-        if(CheckTimer < diff)
+        if (CheckTimer < diff)
         {
             Creature* Shade = Unit::GetCreature((*m_creature), ShadeGUID);
-            if(Shade && Shade->isAlive() && m_creature->isAlive())
+            if (Shade && Shade->isAlive() && m_creature->isAlive())
             {
-                if(m_creature->IsWithinDist(Shade, 20,false))
+                if (m_creature->IsWithinDist(Shade, 20,false))
                 {
                     m_creature->GetMotionMaster()->Clear(false);
                     m_creature->GetMotionMaster()->MoveIdle();
@@ -204,10 +204,10 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
         Sorcerers.clear();
         summons.DespawnAll();//despawn all adds
 
-        if(Creature* Akama = Unit::GetCreature(*m_creature, AkamaGUID))
+        if (Creature* Akama = Unit::GetCreature(*m_creature, AkamaGUID))
         {
             Akama->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);//turn gossip on so players can restart the event
-            if(Akama->isDead())
+            if (Akama->isDead())
             {
                 Akama->Respawn();//respawn akama if dead
                 Akama->AI()->EnterEvadeMode();
@@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
         //m_creature->GetMotionMaster()->MoveIdle();
         m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_STUN);
 
-        if(pInstance && m_creature->isAlive())
+        if (pInstance && m_creature->isAlive())
             pInstance->SetData(DATA_SHADEOFAKAMAEVENT, NOT_STARTED);
 
         reseting = false;
@@ -242,18 +242,18 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
     }
     void JustSummoned(Creature *summon) 
     {
-        if(summon->GetEntry() == CREATURE_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524)
+        if (summon->GetEntry() == CREATURE_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524)
             summons.Summon(summon);
     }
     void SummonedCreatureDespawn(Creature *summon) 
     {
-        if(summon->GetEntry() == CREATURE_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524)
+        if (summon->GetEntry() == CREATURE_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524)
             summons.Despawn(summon);
     }
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(!GridSearcherSucceeded)
+        if (!GridSearcherSucceeded)
         {
             FindChannelers();
 
@@ -282,23 +282,23 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
 
     void AttackStart(Unit* who)
     {
-        if(!who || IsBanished) return;
+        if (!who || IsBanished) return;
 
-        if(who->isTargetableForAttack() && who != m_creature)
+        if (who->isTargetableForAttack() && who != m_creature)
             DoStartMovement(who);
     }
 
     void IncrementDeathCount(uint64 guid = 0)               // If guid is set, will remove it from list of sorcerer
     {
-        if(reseting)
+        if (reseting)
             return;
 
         debug_log("TSCR: Increasing Death Count for Shade of Akama encounter");
         ++DeathCount;
         m_creature->RemoveAuraFromStack(SPELL_SHADE_SOUL_CHANNEL_2);
-        if(guid)
+        if (guid)
         {
-            if(Sorcerers.empty())
+            if (Sorcerers.empty())
                 error_log("SD2 ERROR: Shade of Akama - attempt to remove guid %u from Sorcerers list but list is already empty", guid);
             else  Sorcerers.remove(guid);
         }
@@ -310,10 +310,10 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
         float X = SpawnLocations[random].x;
         float Y = SpawnLocations[random].y;
         // max of 6 sorcerers can be summoned
-        if((rand()%3 == 0) && (DeathCount > 0) && (SorcererCount < 7))
+        if ((rand()%3 == 0) && (DeathCount > 0) && (SorcererCount < 7))
         {
             Creature* Sorcerer = m_creature->SummonCreature(CREATURE_SORCERER, X, Y, Z_SPAWN, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
-            if(Sorcerer)
+            if (Sorcerer)
             {
                 CAST_AI(mob_ashtongue_sorcererAI, Sorcerer->AI())->ShadeGUID = m_creature->GetGUID();
                 Sorcerer->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
@@ -329,7 +329,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
             for(uint8 i = 0; i < 3; ++i)
             {
                 Creature* Spawn = m_creature->SummonCreature(spawnEntries[i], X, Y, Z_SPAWN, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000);
-                if(Spawn)
+                if (Spawn)
                 {
                     Spawn->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
                     Spawn->GetMotionMaster()->MovePoint(0, AGGRO_X, AGGRO_Y, AGGRO_Z);
@@ -345,7 +345,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
         std::list<Creature*> ChannelerList;
         m_creature->GetCreatureListWithEntryInGrid(ChannelerList,CREATURE_CHANNELER,50.0f);
 
-        if(!ChannelerList.empty())
+        if (!ChannelerList.empty())
         {
             for(std::list<Creature*>::iterator itr = ChannelerList.begin(); itr != ChannelerList.end(); ++itr)
             {
@@ -359,14 +359,14 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
 
     void SetSelectableChannelers()
     {
-        if(Channelers.empty())
+        if (Channelers.empty())
         {
             error_log("SD2 ERROR: Channeler List is empty, Shade of Akama encounter will be buggy");
             return;
         }
 
         for(std::list<uint64>::iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr)
-            if(Creature* Channeler = (Unit::GetCreature(*m_creature, *itr)))
+            if (Creature* Channeler = (Unit::GetCreature(*m_creature, *itr)))
                 Channeler->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
     }
 
@@ -374,29 +374,29 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->isInCombat())
+        if (!m_creature->isInCombat())
             return;
 
-        if(IsBanished)
+        if (IsBanished)
         {
             // Akama is set in the threatlist so when we reset, we make sure that he is not included in our check
-            if(m_creature->getThreatManager().getThreatList().size() < 2)
+            if (m_creature->getThreatManager().getThreatList().size() < 2)
             {
                 EnterEvadeMode();
                 return;
             }
 
-            if(DefenderTimer < diff)
+            if (DefenderTimer < diff)
             {
                 uint32 ran = rand()%2;
                 Creature* Defender = m_creature->SummonCreature(CREATURE_DEFENDER, SpawnLocations[ran].x, SpawnLocations[ran].y, Z_SPAWN, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000);
-                if(Defender)
+                if (Defender)
                 {
                     Defender->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
                     bool move = true;
-                    if(AkamaGUID)
+                    if (AkamaGUID)
                     {
-                        if(Creature* Akama = Unit::GetCreature(*m_creature, AkamaGUID))
+                        if (Creature* Akama = Unit::GetCreature(*m_creature, AkamaGUID))
                         {
                             float x, y, z;
                             Akama->GetPosition(x,y,z);
@@ -405,24 +405,24 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
                             Defender->AI()->AttackStart(Akama);
                         }else move = false;
                     }else move = false;
-                    if(!move)
+                    if (!move)
                         Defender->GetMotionMaster()->MovePoint(0, AKAMA_X, AKAMA_Y, AKAMA_Z);
                 }
                 DefenderTimer = 15000;
             }else DefenderTimer -= diff;
 
-            if(SummonTimer < diff)
+            if (SummonTimer < diff)
             {
                 SummonCreature();
                 SummonTimer = 35000;
             }else SummonTimer -= diff;
 
-            if(DeathCount >= 6)
+            if (DeathCount >= 6)
             {
-                if(AkamaGUID)
+                if (AkamaGUID)
                 {
                     Creature* Akama = Unit::GetCreature((*m_creature), AkamaGUID);
-                    if(Akama && Akama->isAlive())
+                    if (Akama && Akama->isAlive())
                     {
                         IsBanished = false;
                         m_creature->GetMotionMaster()->Clear(false);
@@ -442,12 +442,12 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
         }
         else                                                // No longer banished, let's fight Akama now
         {
-            if(ReduceHealthTimer < diff)
+            if (ReduceHealthTimer < diff)
             {
-                if(AkamaGUID)
+                if (AkamaGUID)
                 {
                     Creature* Akama = Unit::GetCreature((*m_creature), AkamaGUID);
-                    if(Akama && Akama->isAlive())
+                    if (Akama && Akama->isAlive())
                     {
                         //10 % less health every few seconds.
                         m_creature->DealDamage(Akama, Akama->GetMaxHealth()/10, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
@@ -456,9 +456,9 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
                 }
             }else ReduceHealthTimer -= diff;
 
-            if(HasKilledAkama)
+            if (HasKilledAkama)
             {
-                if(!HasKilledAkamaAndReseting)//do not let players kill Shade if Akama is dead and Shade is waiting for ResetTimer!! event would bug
+                if (!HasKilledAkamaAndReseting)//do not let players kill Shade if Akama is dead and Shade is waiting for ResetTimer!! event would bug
                 {
                     HasKilledAkamaAndReseting = true;
                     m_creature->RemoveAllAuras();
@@ -468,7 +468,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
                     m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                     m_creature->GetMotionMaster()->MoveTargetedHome();
                 }
-                if(ResetTimer < diff)
+                if (ResetTimer < diff)
                 {
                     EnterEvadeMode();// Reset a little while after killing Akama, evade and respawn Akama
                     return;
@@ -483,7 +483,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
 void mob_ashtongue_channelerAI::JustDied(Unit* killer)
 {
     Creature* Shade = (Unit::GetCreature((*m_creature), ShadeGUID));
-    if(Shade && Shade->isAlive())
+    if (Shade && Shade->isAlive())
         CAST_AI(boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount();
     else error_log("SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama.");
 }
@@ -491,7 +491,7 @@ void mob_ashtongue_channelerAI::JustDied(Unit* killer)
 void mob_ashtongue_sorcererAI::JustDied(Unit* killer)
 {
     Creature* Shade = (Unit::GetCreature((*m_creature), ShadeGUID));
-    if(Shade && Shade->isAlive())
+    if (Shade && Shade->isAlive())
         CAST_AI(boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount(m_creature->GetGUID());
     else error_log("SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama.");
 }
@@ -544,7 +544,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
         LightningBoltTimer = 10000;
         CheckTimer = 2000;
 
-        if(!EventBegun)
+        if (!EventBegun)
         {
             m_creature->SetUInt32Value(UNIT_NPC_FLAGS, 0);      // Database sometimes has very very strange values
             m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@@ -554,12 +554,12 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
 
     void JustSummoned(Creature *summon) 
     {
-        if(summon->GetEntry() == CREATURE_BROKEN)
+        if (summon->GetEntry() == CREATURE_BROKEN)
             summons.Summon(summon);
     }
     void SummonedCreatureDespawn(Creature *summon) 
     {
-        if(summon->GetEntry() == CREATURE_BROKEN)
+        if (summon->GetEntry() == CREATURE_BROKEN)
             summons.Despawn(summon);
     }
 
@@ -567,15 +567,15 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
 
     void BeginEvent(Player* pl)
     {
-        if(!pInstance)
+        if (!pInstance)
             return;
 
         ShadeGUID = pInstance->GetData64(DATA_SHADEOFAKAMA);
-        if(!ShadeGUID)
+        if (!ShadeGUID)
             return;
 
         Creature* Shade = (Unit::GetCreature((*m_creature), ShadeGUID));
-        if(Shade)
+        if (Shade)
         {
             pInstance->SetData(DATA_SHADEOFAKAMAEVENT, IN_PROGRESS);
             // Prevent players from trying to restart event
@@ -586,7 +586,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
             m_creature->CombatStart(Shade);
             Shade->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE);
             Shade->SetUInt64Value(UNIT_FIELD_TARGET, m_creature->GetGUID());
-            if(pl) Shade->AddThreat(pl, 1.0f);
+            if (pl) Shade->AddThreat(pl, 1.0f);
             DoZoneInCombat(Shade);
             EventBegun = true;
         }
@@ -594,7 +594,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
 
     void MovementInform(uint32 type, uint32 id)
     {
-        if(type != POINT_MOTION_TYPE)
+        if (type != POINT_MOTION_TYPE)
             return;
 
         switch(id)
@@ -602,7 +602,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
         case 0: ++WayPointId; break;
 
         case 1:
-            if(Creature* Shade = Unit::GetCreature(*m_creature, ShadeGUID))
+            if (Creature* Shade = Unit::GetCreature(*m_creature, ShadeGUID))
             {
                 m_creature->SetUInt64Value(UNIT_FIELD_TARGET, ShadeGUID);
                 DoCast(Shade, SPELL_AKAMA_SOUL_RETRIEVE);
@@ -628,14 +628,14 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
         BrokenList.clear();
         HasYelledOnce = false;
         Creature* Shade = Unit::GetCreature((*m_creature), ShadeGUID);
-        if(Shade && Shade->isAlive())
+        if (Shade && Shade->isAlive())
             CAST_AI(boss_shade_of_akamaAI, Shade->AI())->HasKilledAkama = true;
         summons.DespawnAll();
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!EventBegun)
+        if (!EventBegun)
             return;
 
         if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 15 && !HasYelledOnce)
@@ -644,14 +644,14 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
             HasYelledOnce = true;
         }
 
-        if(ShadeGUID && !StartCombat)
+        if (ShadeGUID && !StartCombat)
         {
             Creature* Shade = (Unit::GetCreature((*m_creature), ShadeGUID));
-            if(Shade && Shade->isAlive())
+            if (Shade && Shade->isAlive())
             {
-                if(CAST_AI(boss_shade_of_akamaAI, Shade->AI())->IsBanished)
+                if (CAST_AI(boss_shade_of_akamaAI, Shade->AI())->IsBanished)
                 {
-                    if(CastSoulRetrieveTimer < diff)
+                    if (CastSoulRetrieveTimer < diff)
                     {
                         DoCast(Shade, SPELL_AKAMA_SOUL_CHANNEL);
                         CastSoulRetrieveTimer = 500;
@@ -665,30 +665,30 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
             }
         }
 
-        if(ShadeHasDied && (WayPointId == 1))
+        if (ShadeHasDied && (WayPointId == 1))
         {
-            if(pInstance) pInstance->SetData(DATA_SHADEOFAKAMAEVENT, DONE);
+            if (pInstance) pInstance->SetData(DATA_SHADEOFAKAMAEVENT, DONE);
             m_creature->GetMotionMaster()->MovePoint(WayPointId, AkamaWP[1].x, AkamaWP[1].y, AkamaWP[1].z);
             ++WayPointId;
         }
 
-        if(!ShadeHasDied && StartCombat)
+        if (!ShadeHasDied && StartCombat)
         {
-            if(CheckTimer < diff)
+            if (CheckTimer < diff)
             {
-                if(ShadeGUID)
+                if (ShadeGUID)
                 {
                     Creature* Shade = Unit::GetCreature((*m_creature), ShadeGUID);
-                    if(Shade && !Shade->isAlive())
+                    if (Shade && !Shade->isAlive())
                     {
                         ShadeHasDied = true;
                         WayPointId = 0;
                         m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
                         m_creature->GetMotionMaster()->MovePoint(WayPointId, AkamaWP[0].x, AkamaWP[0].y, AkamaWP[0].z);
                     }
-                    if(Shade && Shade->isAlive())
+                    if (Shade && Shade->isAlive())
                     {
-                        if(Shade->getThreatManager().getThreatList().size() < 2)
+                        if (Shade->getThreatManager().getThreatList().size() < 2)
                             Shade->AI()->EnterEvadeMode();
                     }
                 }
@@ -696,9 +696,9 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
             }else CheckTimer -= diff;
         }
 
-        if(SummonBrokenTimer && BrokenSummonIndex < 4)
+        if (SummonBrokenTimer && BrokenSummonIndex < 4)
         {
-            if(SummonBrokenTimer <= diff)
+            if (SummonBrokenTimer <= diff)
             {
                 for(uint8 i = 0; i < 4; ++i)
                 {
@@ -707,7 +707,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
                     float z = BrokenCoords[BrokenSummonIndex].z;
                     float o = BrokenCoords[BrokenSummonIndex].o;
                     Creature* Broken = m_creature->SummonCreature(CREATURE_BROKEN, x, y, z, o, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000);
-                    if(Broken)
+                    if (Broken)
                     {
                         float wx = BrokenWP[BrokenSummonIndex].x + (i*5);
                         float wy = BrokenWP[BrokenSummonIndex].y + (i*5);
@@ -722,8 +722,8 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
             }else SummonBrokenTimer -= diff;
         }
 
-        if(SoulRetrieveTimer)
-            if(SoulRetrieveTimer <= diff)
+        if (SoulRetrieveTimer)
+            if (SoulRetrieveTimer <= diff)
             {
                 switch(EndingTalkCount)
                 {
@@ -739,13 +739,13 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
                     SoulRetrieveTimer = 25000;
                     break;
                 case 2:
-                    if(!BrokenList.empty())
+                    if (!BrokenList.empty())
                     {
                         bool Yelled = false;
                         for(std::list<uint64>::iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr)
-                            if(Creature* pUnit = Unit::GetCreature(*m_creature, *itr))
+                            if (Creature* pUnit = Unit::GetCreature(*m_creature, *itr))
                             {
-                                if(!Yelled)
+                                if (!Yelled)
                                 {
                                     DoScriptText(SAY_BROKEN_FREE_01, pUnit);
                                     Yelled = true;
@@ -757,10 +757,10 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
                     SoulRetrieveTimer = 1500;
                     break;
                 case 3:
-                    if(!BrokenList.empty())
+                    if (!BrokenList.empty())
                     {
                         for(std::list<uint64>::iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr)
-                            if(Creature* pUnit = Unit::GetCreature(*m_creature, *itr))
+                            if (Creature* pUnit = Unit::GetCreature(*m_creature, *itr))
                                 // This is the incorrect spell, but can't seem to find the right one.
                                 pUnit->CastSpell(pUnit, 39656, true);
                     }
@@ -768,10 +768,10 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
                     SoulRetrieveTimer = 5000;
                     break;
                 case 4:
-                    if(!BrokenList.empty())
+                    if (!BrokenList.empty())
                     {
                         for(std::list<uint64>::iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr)
-                            if(Creature* pUnit = Unit::GetCreature((*m_creature), *itr))
+                            if (Creature* pUnit = Unit::GetCreature((*m_creature), *itr))
                                 pUnit->MonsterYell(SAY_BROKEN_FREE_02, LANG_UNIVERSAL, 0);
                     }
                     SoulRetrieveTimer = 0;
@@ -779,10 +779,10 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
                 }
             }else SoulRetrieveTimer -= diff;
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(DestructivePoisonTimer < diff)
+        if (DestructivePoisonTimer < diff)
         {
             Creature* Shade = Unit::GetCreature((*m_creature), ShadeGUID);
             if (Shade && Shade->isAlive())
@@ -790,7 +790,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
             DestructivePoisonTimer = 15000;
         }else DestructivePoisonTimer -= diff;
 
-        if(LightningBoltTimer < diff)
+        if (LightningBoltTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_LIGHTNING_BOLT);
             LightningBoltTimer = 10000;
@@ -820,23 +820,23 @@ CreatureAI* GetAI_npc_akama_shade(Creature *_Creature)
     return new npc_akamaAI (_Creature);
 }
 
-bool GossipSelect_npc_akama(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_akama(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)               //Fight time
     {
-        player->CLOSE_GOSSIP_MENU();
-        CAST_AI(npc_akamaAI, _Creature->AI())->BeginEvent(player);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        CAST_AI(npc_akamaAI, _Creature->AI())->BeginEvent(pPlayer);
     }
 
     return true;
 }
 
-bool GossipHello_npc_akama(Player *player, Creature *_Creature)
+bool GossipHello_npc_akama(Player* pPlayer, Creature *_Creature)
 {
-    if(player->isAlive())
+    if (pPlayer->isAlive())
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-        player->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
     }
 
     return true;
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp
index 0ae2acbfd99..ae3a807f969 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp
@@ -79,9 +79,9 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
         {
-            if(m_creature->isAlive())
+            if (m_creature->isAlive())
             {
                 pInstance->SetData(DATA_SUPREMUSEVENT, NOT_STARTED);
                 //ToggleDoors(true);
@@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_SUPREMUSEVENT, IN_PROGRESS);
 
         ChangePhase();
@@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
 
     void ChangePhase()
     {
-        if(!phase || phase == PHASE_CHASE)
+        if (!phase || phase == PHASE_CHASE)
         {
             phase = PHASE_STRIKE;
             summons.DoAction(EVENT_VOLCANO, 0);
@@ -133,7 +133,7 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
 
     void JustDied(Unit *killer)
     {
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(DATA_SUPREMUSEVENT, DONE);
             pInstance->HandleGameObject(pInstance->GetData64(DATA_GAMEOBJECT_SUPREMUS_DOORS), true);
@@ -154,9 +154,9 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
         for (i = m_threatlist.begin(); i!= m_threatlist.end(); ++i)
         {
             Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
-            if(pUnit && m_creature->IsWithinMeleeRange(pUnit))
+            if (pUnit && m_creature->IsWithinMeleeRange(pUnit))
             {
-                if(pUnit->GetHealth() > health)
+                if (pUnit->GetHealth() > health)
                 {
                     health = pUnit->GetHealth();
                     target = pUnit;
@@ -187,13 +187,13 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
                     events.ScheduleEvent(EVENT_FLAME, 20000, GCD_CAST);
                     break;
                 case EVENT_HATEFUL_STRIKE:
-                    if(Unit* target = CalculateHatefulStrikeTarget())
+                    if (Unit* target = CalculateHatefulStrikeTarget())
                         DoCast(target, SPELL_HATEFUL_STRIKE);
                     events.DelayEvents(1000, GCD_CAST);
                     events.ScheduleEvent(EVENT_HATEFUL_STRIKE, 5000, GCD_CAST, PHASE_STRIKE);
                     break;
                 case EVENT_SWITCH_TARGET:
-                    if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true))
+                    if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true))
                     {
                         DoResetThreat();
                         m_creature->AddThreat(target, 5000000.0f);
@@ -204,8 +204,8 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
                 case EVENT_VOLCANO:
                 {
                     Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 999, true);
-                    if(!target) target = m_creature->getVictim();
-                    if(target)
+                    if (!target) target = m_creature->getVictim();
+                    if (target)
                     {
                         //DoCast(target, SPELL_VOLCANIC_SUMMON);//movement bugged
                         m_creature->SummonCreature(CREATURE_VOLCANO,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000);
@@ -250,7 +250,7 @@ struct TRINITY_DLL_DECL npc_volcanoAI : public Scripted_NoMovementAI
 
     void UpdateAI(const uint32 diff) 
     {
-        if(wait<=diff)//wait 3secs before casting
+        if (wait<=diff)//wait 3secs before casting
         {
             DoCast(m_creature, SPELL_VOLCANIC_ERUPTION);
             wait = 60000;
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp
index 9df6a8d783c..3d7f0c7c5c4 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp
@@ -76,14 +76,14 @@ struct TRINITY_DLL_DECL mob_doom_blossomAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(CheckTeronTimer < diff)
+        if (CheckTeronTimer < diff)
         {
-            if(TeronGUID)
+            if (TeronGUID)
             {
                 DoZoneInCombat();
 
                 Creature* Teron = (Unit::GetCreature((*m_creature), TeronGUID));
-                if((Teron) && (!Teron->isAlive() || Teron->IsInEvadeMode()))
+                if ((Teron) && (!Teron->isAlive() || Teron->IsInEvadeMode()))
                     Despawn();
             }
             else
@@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL mob_doom_blossomAI : public ScriptedAI
             CheckTeronTimer = 5000;
         }else CheckTeronTimer -= diff;
 
-        if(ShadowBoltTimer < diff && m_creature->isInCombat())
+        if (ShadowBoltTimer < diff && m_creature->isInCombat())
         {
             DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_SHADOWBOLT);
             ShadowBoltTimer = 10000;
@@ -126,7 +126,7 @@ struct TRINITY_DLL_DECL mob_shadowy_constructAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(!who || (!who->isAlive()) || (who->GetGUID() == GhostGUID))
+        if (!who || (!who->isAlive()) || (who->GetGUID() == GhostGUID))
             return;
 
         ScriptedAI::MoveInLineOfSight(who);
@@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL mob_shadowy_constructAI : public ScriptedAI
 /* Comment it out for now. NOTE TO FUTURE DEV: UNCOMMENT THIS OUT ONLY AFTER MIND CONTROL IS IMPLEMENTED
     void DamageTaken(Unit* done_by, uint32 &damage)
     {
-        if(done_by->GetGUID() != GhostGUID)
+        if (done_by->GetGUID() != GhostGUID)
         damage = 0;                                         // Only the ghost can deal damage.
     }
  */
@@ -143,19 +143,19 @@ struct TRINITY_DLL_DECL mob_shadowy_constructAI : public ScriptedAI
     void CheckPlayers()
     {
         std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList();
-        if(m_threatlist.empty())
+        if (m_threatlist.empty())
             return;                                         // No threat list. Don't continue.
         std::list<HostilReference*>::iterator itr = m_threatlist.begin();
         std::list<Unit*> targets;
-        for( ; itr != m_threatlist.end(); ++itr)
+        for(; itr != m_threatlist.end(); ++itr)
         {
             Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid());
-            if(pUnit && pUnit->isAlive())
+            if (pUnit && pUnit->isAlive())
                 targets.push_back(pUnit);
         }
         targets.sort(ObjectDistanceOrder(m_creature));
         Unit* target = targets.front();
-        if(target && m_creature->IsWithinDistInMap(target, m_creature->GetAttackDistance(target)))
+        if (target && m_creature->IsWithinDistInMap(target, m_creature->GetAttackDistance(target)))
         {
             DoCast(target, SPELL_ATROPHY);
             m_creature->AI()->AttackStart(target);
@@ -164,16 +164,16 @@ struct TRINITY_DLL_DECL mob_shadowy_constructAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(CheckPlayerTimer < diff)
+        if (CheckPlayerTimer < diff)
         {
             CheckPlayers();
             CheckPlayerTimer = 3000;
         }else CheckPlayerTimer -= diff;
 
-        if(CheckTeronTimer < diff)
+        if (CheckTeronTimer < diff)
         {
             Creature* Teron = (Unit::GetCreature((*m_creature), TeronGUID));
-            if(!Teron || !Teron->isAlive() || Teron->IsInEvadeMode())
+            if (!Teron || !Teron->isAlive() || Teron->IsInEvadeMode())
                 m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
 
             CheckTeronTimer = 5000;
@@ -207,7 +207,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_TERONGOREFIENDEVENT, NOT_STARTED);
 
         IncinerateTimer = 20000 + rand()%11000;
@@ -235,7 +235,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
         {
             if (m_creature->IsWithinDistInMap(pWho, VISIBLE_RANGE) && m_creature->IsWithinLOSInMap(pWho))
             {
-                if(pInstance)
+                if (pInstance)
                     pInstance->SetData(DATA_TERONGOREFIENDEVENT, IN_PROGRESS);
 
                 m_creature->GetMotionMaster()->Clear(false);
@@ -246,7 +246,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
                 Intro = true;
             }
         }
-        if(Done)
+        if (Done)
             ScriptedAI::MoveInLineOfSight(pWho);
     }
 
@@ -261,7 +261,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
 
     void JustDied(Unit *victim)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_TERONGOREFIENDEVENT, DONE);
 
         DoScriptText(SAY_DEATH, m_creature);
@@ -284,14 +284,14 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
 
     void SetThreatList(Creature* Blossom)
     {
-        if(!Blossom) return;
+        if (!Blossom) return;
 
         std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList();
         std::list<HostilReference*>::iterator i = m_threatlist.begin();
         for(i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
         {
             Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
-            if(pUnit && pUnit->isAlive())
+            if (pUnit && pUnit->isAlive())
             {
                 float threat = DoGetThreat(pUnit);
                 Blossom->AddThreat(pUnit, threat);
@@ -309,14 +309,14 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
         /************************************************************************/
 
         Unit* Ghost = NULL;
-        if(GhostGUID)
+        if (GhostGUID)
             Ghost = Unit::GetUnit((*m_creature), GhostGUID);
-        if(Ghost && Ghost->isAlive() && Ghost->HasAura(SPELL_SHADOW_OF_DEATH))
+        if (Ghost && Ghost->isAlive() && Ghost->HasAura(SPELL_SHADOW_OF_DEATH))
         {
             /*float x,y,z;
             Ghost->GetPosition(x,y,z);
             Creature* control = m_creature->SummonCreature(CREATURE_GHOST, x, y, z, 0, TEMPSUMMON_TIMED_DESAWN, 30000);
-            if(control)
+            if (control)
             {
                 CAST_PLR(Ghost)->Possess(control);
                 Ghost->DealDamage(Ghost, Ghost->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL,
@@ -328,16 +328,16 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
                 float X = CalculateRandomLocation(Ghost->GetPositionX(), 10);
                 float Y = CalculateRandomLocation(Ghost->GetPositionY(), 10);
                 Construct = m_creature->SummonCreature(CREATURE_SHADOWY_CONSTRUCT, X, Y, Ghost->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000);
-                if(Construct)
+                if (Construct)
                 {
                     Construct->CastSpell(Construct, SPELL_PASSIVE_SHADOWFORM, true);
                     SetThreatList(Construct);               // Use same function as Doom Blossom to set Threat List.
                     CAST_AI(mob_shadowy_constructAI, Construct->AI())->GhostGUID = GhostGUID;
                     Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-                    if(!target)                             // someone's trying to solo.
+                    if (!target)                             // someone's trying to solo.
                         target = m_creature->getVictim();
 
-                    if(target)
+                    if (target)
                         Construct->GetMotionMaster()->MoveChase(target);
                 }
             }
@@ -346,19 +346,19 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(Intro && !Done)
+        if (Intro && !Done)
         {
-            if(AggroTimer < diff)
+            if (AggroTimer < diff)
             {
                 m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 DoScriptText(SAY_AGGRO, m_creature);
                 m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE);
                 Done = true;
-                if(AggroTargetGUID)
+                if (AggroTargetGUID)
                 {
                     Unit* pUnit = Unit::GetUnit((*m_creature), AggroTargetGUID);
-                    if(pUnit)
+                    if (pUnit)
                         AttackStart(pUnit);
 
                     DoZoneInCombat();
@@ -371,10 +371,10 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
             }else AggroTimer -= diff;
         }
 
-        if(!UpdateVictim() || !Done)
+        if (!UpdateVictim() || !Done)
             return;
 
-        if(SummonShadowsTimer < diff)
+        if (SummonShadowsTimer < diff)
         {
             //MindControlGhost();
 
@@ -383,20 +383,20 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
                 Creature* Shadow = NULL;
                 float X = CalculateRandomLocation(m_creature->GetPositionX(), 10);
                 Shadow = m_creature->SummonCreature(CREATURE_SHADOWY_CONSTRUCT, X, m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 0);
-                if(Shadow)
+                if (Shadow)
                 {
                     Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-                    if(!target)
+                    if (!target)
                         target = m_creature->getVictim();
 
-                    if(target)
+                    if (target)
                         Shadow->AI()->AttackStart(target);
                 }
             }
             SummonShadowsTimer = 60000;
         }else SummonShadowsTimer -= diff;
 
-        if(SummonDoomBlossomTimer < diff)
+        if (SummonDoomBlossomTimer < diff)
         {
             if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
@@ -405,7 +405,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
                 float Z = target->GetPositionZ();
                 Z = m_creature->GetMap()->GetVmapHeight(X, Y, Z, true);
                 Creature* DoomBlossom = m_creature->SummonCreature(CREATURE_DOOM_BLOSSOM, X, Y, Z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 20000);
-                if(DoomBlossom)
+                if (DoomBlossom)
                 {
                     DoomBlossom->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                     DoomBlossom->setFaction(m_creature->getFaction());
@@ -418,13 +418,13 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
             }
         }else SummonDoomBlossomTimer -= diff;
 
-        if(IncinerateTimer < diff)
+        if (IncinerateTimer < diff)
         {
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-            if(!target)
+            if (!target)
                 target = m_creature->getVictim();
 
-            if(target)
+            if (target)
             {
                 switch(rand()%2)
                 {
@@ -436,23 +436,23 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
             }
         }else IncinerateTimer -= diff;
 
-        if(CrushingShadowsTimer < diff)
+        if (CrushingShadowsTimer < diff)
         {
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-            if(target && target->isAlive())
+            if (target && target->isAlive())
                 DoCast(target, SPELL_CRUSHING_SHADOWS);
             CrushingShadowsTimer = 10000 + rand()%16 * 1000;
         }else CrushingShadowsTimer -= diff;
 
         /*** NOTE FOR FUTURE DEV: UNCOMMENT BELOW ONLY IF MIND CONTROL IS FULLY IMPLEMENTED **/
-        /*if(ShadowOfDeathTimer < diff)
+        /*if (ShadowOfDeathTimer < diff)
         {
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
 
-            if(!target)
+            if (!target)
                target = m_creature->getVictim();
 
-            if(target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER)
+            if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER)
             {
                 DoCast(target, SPELL_SHADOW_OF_DEATH);
                 GhostGUID = target->GetGUID();
@@ -461,7 +461,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
             }
         }else ShadowOfDeathTimer -= diff;*/
 
-        if(RandomYellTimer < diff)
+        if (RandomYellTimer < diff)
         {
             switch(rand()%2)
             {
@@ -471,9 +471,9 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
             RandomYellTimer = 50000 + rand()%51 * 1000;
         }else RandomYellTimer -= diff;
 
-        if(!m_creature->HasAura(SPELL_BERSERK))
+        if (!m_creature->HasAura(SPELL_BERSERK))
         {
-            if(EnrageTimer < diff)
+            if (EnrageTimer < diff)
         {
             DoCast(m_creature, SPELL_BERSERK);
             DoScriptText(SAY_ENRAGE, m_creature);
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp
index b7b44da4f80..7c7224b3efd 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp
@@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI
 
         SpineTargetGUID = 0;
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, NOT_STARTED);
     }
 
@@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI
 
     void JustDied(Unit *victim)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, DONE);
 
         DoScriptText(SAY_DEATH, m_creature);
@@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI
 
     void SpellHit(Unit *caster, const SpellEntry *spell)
     {
-        if(spell->Id == SPELL_HURL_SPINE && m_creature->HasAura(SPELL_TIDAL_SHIELD))
+        if (spell->Id == SPELL_HURL_SPINE && m_creature->HasAura(SPELL_TIDAL_SHIELD))
         {
             m_creature->RemoveAurasDueToSpell(SPELL_TIDAL_SHIELD);
             m_creature->CastSpell(m_creature, SPELL_TIDAL_BURST, true);
@@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, IN_PROGRESS);
 
         DoScriptText(SAY_AGGRO, m_creature);
@@ -118,9 +118,9 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI
 
     bool RemoveImpalingSpine()
     {
-        if(!SpineTargetGUID) return false;
+        if (!SpineTargetGUID) return false;
         Unit* target = Unit::GetUnit(*m_creature, SpineTargetGUID);
-        if(target && target->HasAura(SPELL_IMPALING_SPINE))
+        if (target && target->HasAura(SPELL_IMPALING_SPINE))
             target->RemoveAurasDueToSpell(SPELL_IMPALING_SPINE);
         SpineTargetGUID=0;
         return true;
@@ -156,8 +156,8 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI
                 case EVENT_SPINE:
                 {
                     Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-                    if(!target) target = m_creature->getVictim();
-                    if(target)
+                    if (!target) target = m_creature->getVictim();
+                    if (target)
                     {
                         m_creature->CastSpell(target, SPELL_IMPALING_SPINE, true);
                         SpineTargetGUID = target->GetGUID();
@@ -193,13 +193,13 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI
     }
 };
 
-bool GOHello_go_najentus_spine(Player *player, GameObject* _GO)
+bool GOHello_go_najentus_spine(Player* pPlayer, GameObject* _GO)
 {
-    if(ScriptedInstance* pInstance = _GO->GetInstanceData())
-        if(Creature* Najentus = Unit::GetCreature(*_GO, pInstance->GetData64(DATA_HIGHWARLORDNAJENTUS)))
-            if(CAST_AI(boss_najentusAI, Najentus->AI())->RemoveImpalingSpine())
+    if (ScriptedInstance* pInstance = _GO->GetInstanceData())
+        if (Creature* Najentus = Unit::GetCreature(*_GO, pInstance->GetData64(DATA_HIGHWARLORDNAJENTUS)))
+            if (CAST_AI(boss_najentusAI, Najentus->AI())->RemoveImpalingSpine())
             {
-                player->CastSpell(player, SPELL_CREATE_NAJENTUS_SPINE, true);
+                pPlayer->CastSpell(pPlayer, SPELL_CREATE_NAJENTUS_SPINE, true);
                 _GO->DeleteObjectWithOwner();
             }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp
index 5af9a792a21..908c00a37fa 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp
@@ -137,7 +137,7 @@ struct TRINITY_DLL_DECL mob_blood_elf_council_voice_triggerAI : public ScriptedA
     // finds and stores the GUIDs for each Council member using instance data system.
     void LoadCouncilGUIDs()
     {
-        if(ScriptedInstance* pInstance = (m_creature->GetInstanceData()))
+        if (ScriptedInstance* pInstance = (m_creature->GetInstanceData()))
         {
             Council[0] = pInstance->GetData64(DATA_GATHIOSTHESHATTERER);
             Council[1] = pInstance->GetData64(DATA_VERASDARKSHADOW);
@@ -153,32 +153,32 @@ struct TRINITY_DLL_DECL mob_blood_elf_council_voice_triggerAI : public ScriptedA
 
     void UpdateAI(const uint32 diff)
     {
-        if(!EventStarted)
+        if (!EventStarted)
             return;
 
-        if(YellCounter > 3)
+        if (YellCounter > 3)
             return;
 
-        if(AggroYellTimer)
+        if (AggroYellTimer)
         {
-            if(AggroYellTimer <= diff)
+            if (AggroYellTimer <= diff)
         {
-            if(Unit* pMember = Unit::GetUnit(*m_creature, Council[YellCounter]))
+            if (Unit* pMember = Unit::GetUnit(*m_creature, Council[YellCounter]))
             {
                 DoScriptText(CouncilAggro[YellCounter].entry, pMember);
                 AggroYellTimer = CouncilAggro[YellCounter].timer;
             }
             ++YellCounter;
-            if(YellCounter > 3)
+            if (YellCounter > 3)
                 YellCounter = 0;                            // Reuse for Enrage Yells
         }else AggroYellTimer -= diff;
         }
 
-        if(EnrageTimer)
+        if (EnrageTimer)
         {
-            if(EnrageTimer <= diff)
+            if (EnrageTimer <= diff)
         {
-            if(Unit* pMember = Unit::GetUnit(*m_creature, Council[YellCounter]))
+            if (Unit* pMember = Unit::GetUnit(*m_creature, Council[YellCounter]))
             {
                 pMember->CastSpell(pMember, SPELL_BERSERK, true);
                 DoScriptText(CouncilEnrage[YellCounter].entry, pMember);
@@ -220,9 +220,9 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
         Creature* pMember = NULL;
         for(uint8 i = 0; i < 4; ++i)
         {
-            if(pMember = (Unit::GetCreature((*m_creature), Council[i])))
+            if (pMember = (Unit::GetCreature((*m_creature), Council[i])))
             {
-                if(!pMember->isAlive())
+                if (!pMember->isAlive())
                 {
                     pMember->RemoveCorpse();
                     pMember->Respawn();
@@ -231,10 +231,10 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
             }
         }
 
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(DATA_ILLIDARICOUNCILEVENT, NOT_STARTED);
-            if(Creature* VoiceTrigger = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE))))
+            if (Creature* VoiceTrigger = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE))))
                 VoiceTrigger->AI()->EnterEvadeMode();
         }
 
@@ -251,9 +251,9 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
 
     void StartEvent(Unit *target)
     {
-        if(!pInstance) return;
+        if (!pInstance) return;
 
-        if(target && target->isAlive())
+        if (target && target->isAlive())
         {
             Council[0] = pInstance->GetData64(DATA_GATHIOSTHESHATTERER);
             Council[1] = pInstance->GetData64(DATA_HIGHNETHERMANCERZEREVOR);
@@ -261,7 +261,7 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
             Council[3] = pInstance->GetData64(DATA_VERASDARKSHADOW);
 
             // Start the event for the Voice Trigger
-            if(Creature* VoiceTrigger = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE))))
+            if (Creature* VoiceTrigger = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE))))
             {
                 CAST_AI(mob_blood_elf_council_voice_triggerAI, VoiceTrigger->AI())->LoadCouncilGUIDs();
                 CAST_AI(mob_blood_elf_council_voice_triggerAI, VoiceTrigger->AI())->EventStarted = true;
@@ -270,10 +270,10 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
             for(uint8 i = 0; i < 4; ++i)
             {
                 Unit* Member = NULL;
-                if(Council[i])
+                if (Council[i])
                 {
                     Member = Unit::GetUnit((*m_creature), Council[i]);
-                    if(Member && Member->isAlive())
+                    if (Member && Member->isAlive())
                         CAST_CRE(Member)->AI()->AttackStart(target);
                 }
             }
@@ -286,17 +286,17 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!EventBegun) return;
+        if (!EventBegun) return;
 
-        if(EndEventTimer)
+        if (EndEventTimer)
         {
-            if(EndEventTimer <= diff)
+            if (EndEventTimer <= diff)
             {
-                if(DeathCount > 3)
+                if (DeathCount > 3)
                 {
-                    if(pInstance)
+                    if (pInstance)
                     {
-                        if(Creature* VoiceTrigger = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE))))
+                        if (Creature* VoiceTrigger = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE))))
                             VoiceTrigger->DealDamage(VoiceTrigger, VoiceTrigger->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                         pInstance->SetData(DATA_ILLIDARICOUNCILEVENT, DONE);
                         m_creature->SummonCreature(AKAMAID,746.466980f,304.394989f,311.90208f,6.272870f,TEMPSUMMON_DEAD_DESPAWN,0);
@@ -306,28 +306,28 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
                 }
 
                 Creature* pMember = (Unit::GetCreature(*m_creature, Council[DeathCount]));
-                if(pMember && pMember->isAlive())
+                if (pMember && pMember->isAlive())
                     pMember->DealDamage(pMember, pMember->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                 ++DeathCount;
                 EndEventTimer = 1500;
             }else EndEventTimer -= diff;
         }
 
-        if(CheckTimer)
+        if (CheckTimer)
         {
-            if(CheckTimer <= diff)
+            if (CheckTimer <= diff)
             {
                 uint8 EvadeCheck = 0;
                 for(uint8 i = 0; i < 4; ++i)
                 {
-                    if(Council[i])
+                    if (Council[i])
                     {
-                        if(Creature* Member = (Unit::GetCreature((*m_creature), Council[i])))
+                        if (Creature* Member = (Unit::GetCreature((*m_creature), Council[i])))
                         {
                             // This is the evade/death check.
-                            if(Member->isAlive() && !Member->getVictim())
+                            if (Member->isAlive() && !Member->getVictim())
                                 ++EvadeCheck;                   //If all members evade, we reset so that players can properly reset the event
-                            else if(!Member->isAlive())         // If even one member dies, kill the rest, set instance data, and kill self.
+                            else if (!Member->isAlive())         // If even one member dies, kill the rest, set instance data, and kill self.
                             {
                                 EndEventTimer = 1000;
                                 CheckTimer = 0;
@@ -337,7 +337,7 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
                     }
                 }
 
-                if(EvadeCheck > 3)
+                if (EvadeCheck > 3)
                     Reset();
 
                 CheckTimer = 2000;
@@ -365,10 +365,10 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI
 
     void EnterCombat(Unit* who)
     {
-        if(pInstance)
+        if (pInstance)
         {
             Creature* Controller = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_ILLIDARICOUNCIL)));
-            if(Controller)
+            if (Controller)
                 CAST_AI(mob_illidari_councilAI, Controller->AI())->StartEvent(who);
         }
         else
@@ -382,7 +382,7 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI
         // this means that for each creature, it will attempt to LoadGUIDs even though some of the other creatures are
         // not in world, and thus have no GUID set in the instance data system. Putting it in aggro ensures that all the creatures
         // have been loaded and have their GUIDs set in the instance data system.
-        if(!LoadedGUIDs)
+        if (!LoadedGUIDs)
             LoadGUIDs();
     }
 
@@ -390,8 +390,8 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI
     {
         for(uint8 i = 0; i < 4; ++i)
         {
-            if(Unit* pUnit = Unit::GetUnit(*m_creature, Council[i]))
-                if(pUnit != m_creature && pUnit->getVictim())
+            if (Unit* pUnit = Unit::GetUnit(*m_creature, Council[i]))
+                if (pUnit != m_creature && pUnit->getVictim())
                 {
                     AttackStart(pUnit->getVictim());
                     return;
@@ -402,14 +402,14 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI
 
     void DamageTaken(Unit* done_by, uint32 &damage)
     {
-        if(done_by == m_creature)
+        if (done_by == m_creature)
             return;
 
         damage /= 4;
         for(uint8 i = 0; i < 4; ++i)
         {
-            if(Creature* pUnit = Unit::GetCreature(*m_creature, Council[i]))
-                if(pUnit != m_creature && damage < pUnit->GetHealth())
+            if (Creature* pUnit = Unit::GetCreature(*m_creature, Council[i]))
+                if (pUnit != m_creature && damage < pUnit->GetHealth())
                 {
                     pUnit->SetHealth(pUnit->GetHealth() - damage);
                     pUnit->LowerPlayerDamageReq(damage);
@@ -419,7 +419,7 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI
 
     void LoadGUIDs()
     {
-        if(!pInstance)
+        if (!pInstance)
         {
             error_log(ERROR_INST_DATA);
             return;
@@ -468,10 +468,10 @@ struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_coun
         Unit* pUnit = m_creature;
         uint32 member = 0;                                  // He chooses Lady Malande most often
 
-        if(rand()%10 == 0)                                  // But there is a chance he picks someone else.
+        if (rand()%10 == 0)                                  // But there is a chance he picks someone else.
             member = urand(1, 3);
 
-        if(member != 2)                                     // No need to create another pointer to us using Unit::GetUnit
+        if (member != 2)                                     // No need to create another pointer to us using Unit::GetUnit
             pUnit = Unit::GetUnit((*m_creature), Council[member]);
         return pUnit;
     }
@@ -487,19 +487,19 @@ struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_coun
         for(uint8 i = 0; i < 4; ++i)
         {
             Unit* pUnit = Unit::GetUnit((*m_creature), Council[i]);
-            if(pUnit)
+            if (pUnit)
                 pUnit->CastSpell(pUnit, spellid, true, 0, 0, m_creature->GetGUID());
         }
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(BlessingTimer < diff)
+        if (BlessingTimer < diff)
         {
-            if(Unit* pUnit = SelectCouncilMember())
+            if (Unit* pUnit = SelectCouncilMember())
             {
                 switch(rand()%2)
                 {
@@ -510,15 +510,15 @@ struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_coun
             BlessingTimer = 60000;
         }else BlessingTimer -= diff;
 
-        if(ConsecrationTimer < diff)
+        if (ConsecrationTimer < diff)
         {
             DoCast(m_creature, SPELL_CONSECRATION);
             ConsecrationTimer = 40000;
         }else ConsecrationTimer -= diff;
 
-        if(HammerOfJusticeTimer < diff)
+        if (HammerOfJusticeTimer < diff)
         {
-            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
                 // is in ~10-40 yd range
                 if (m_creature->IsInRange(target, 10.0f, 40.0f, false))
@@ -529,7 +529,7 @@ struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_coun
             }
         }else HammerOfJusticeTimer -= diff;
 
-        if(SealTimer < diff)
+        if (SealTimer < diff)
         {
             switch(rand()%2)
             {
@@ -539,7 +539,7 @@ struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_coun
             SealTimer = 40000;
         }else SealTimer -= diff;
 
-        if(AuraTimer < diff)
+        if (AuraTimer < diff)
         {
             CastAuraOnCouncil();
             AuraTimer = 90000;
@@ -582,12 +582,12 @@ struct TRINITY_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(Cooldown)
+        if (Cooldown)
         {
-            if(Cooldown < diff) Cooldown = 0;
+            if (Cooldown < diff) Cooldown = 0;
             else
             {
                 Cooldown -= diff;
@@ -595,7 +595,7 @@ struct TRINITY_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_
             }
         }
 
-        if(DampenMagicTimer < diff)
+        if (DampenMagicTimer < diff)
         {
             DoCast(m_creature, SPELL_DAMPEN_MAGIC);
             Cooldown = 1000;
@@ -603,23 +603,23 @@ struct TRINITY_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_
             ArcaneBoltTimer += 1000;                        // Give the Mage some time to spellsteal Dampen.
         }else DampenMagicTimer -= diff;
 
-        if(ArcaneExplosionTimer < diff)
+        if (ArcaneExplosionTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_ARCANE_EXPLOSION);
             Cooldown = 1000;
             ArcaneExplosionTimer = 14000;
         }else ArcaneExplosionTimer -= diff;
 
-        if(ArcaneBoltTimer < diff)
+        if (ArcaneBoltTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_ARCANE_BOLT);
             ArcaneBoltTimer = 3000;
             Cooldown = 2000;
         }else ArcaneBoltTimer -= diff;
 
-        if(BlizzardTimer < diff)
+        if (BlizzardTimer < diff)
         {
-            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
                 DoCast(target, SPELL_BLIZZARD);
                 BlizzardTimer = 45000 + rand()%46 * 1000;
@@ -628,9 +628,9 @@ struct TRINITY_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_
             }
         }else BlizzardTimer -= diff;
 
-        if(FlamestrikeTimer < diff)
+        if (FlamestrikeTimer < diff)
         {
-            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
                 DoCast(target, SPELL_FLAMESTRIKE);
                 FlamestrikeTimer = 55000 + rand()%46 * 1000;
@@ -670,34 +670,34 @@ struct TRINITY_DLL_DECL boss_lady_malandeAI : public boss_illidari_councilAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(EmpoweredSmiteTimer < diff)
+        if (EmpoweredSmiteTimer < diff)
         {
-            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
                 DoCast(target, SPELL_EMPOWERED_SMITE);
                 EmpoweredSmiteTimer = 38000;
             }
         }else EmpoweredSmiteTimer -= diff;
 
-        if(CircleOfHealingTimer < diff)
+        if (CircleOfHealingTimer < diff)
         {
             DoCast(m_creature, SPELL_CIRCLE_OF_HEALING);
             CircleOfHealingTimer = 60000;
         }else CircleOfHealingTimer -= diff;
 
-        if(DivineWrathTimer < diff)
+        if (DivineWrathTimer < diff)
         {
-            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
                 DoCast(target, SPELL_DIVINE_WRATH);
                 DivineWrathTimer = 40000 + rand()%41 * 1000;
             }
         }else DivineWrathTimer -= diff;
 
-        if(ReflectiveShieldTimer < diff)
+        if (ReflectiveShieldTimer < diff)
         {
             DoCast(m_creature, SPELL_REFLECTIVE_SHIELD);
             ReflectiveShieldTimer = 65000;
@@ -744,26 +744,26 @@ struct TRINITY_DLL_DECL boss_veras_darkshadowAI : public boss_illidari_councilAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(!HasVanished)
+        if (!HasVanished)
         {
-            if(DeadlyPoisonTimer < diff)
+            if (DeadlyPoisonTimer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_DEADLY_POISON);
                 DeadlyPoisonTimer = 15000 + rand()%31 * 1000;
             }else DeadlyPoisonTimer -= diff;
 
-            if(AppearEnvenomTimer < diff)                   // Cast Envenom. This is cast 4 seconds after Vanish is over
+            if (AppearEnvenomTimer < diff)                   // Cast Envenom. This is cast 4 seconds after Vanish is over
             {
                 DoCast(m_creature->getVictim(), SPELL_ENVENOM);
                 AppearEnvenomTimer = 90000;
             }else AppearEnvenomTimer -= diff;
 
-            if(VanishTimer < diff)                          // Disappear and stop attacking, but follow a random unit
+            if (VanishTimer < diff)                          // Disappear and stop attacking, but follow a random unit
             {
-                if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 {
                     VanishTimer = 30000;
                     AppearEnvenomTimer= 28000;
@@ -781,7 +781,7 @@ struct TRINITY_DLL_DECL boss_veras_darkshadowAI : public boss_illidari_councilAI
         }
         else
         {
-            if(VanishTimer < diff)                          // Become attackable and poison current target
+            if (VanishTimer < diff)                          // Become attackable and poison current target
             {
                 Unit* target = m_creature->getVictim();
                 DoCast(target, SPELL_DEADLY_POISON);
@@ -794,7 +794,7 @@ struct TRINITY_DLL_DECL boss_veras_darkshadowAI : public boss_illidari_councilAI
                 HasVanished = false;
             }else VanishTimer -= diff;
 
-            if(AppearEnvenomTimer < diff)                   // Appear 2 seconds before becoming attackable (Shifting out of vanish)
+            if (AppearEnvenomTimer < diff)                   // Appear 2 seconds before becoming attackable (Shifting out of vanish)
             {
                 m_creature->GetMotionMaster()->Clear();
                 m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
diff --git a/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp b/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp
index 223d770aa62..7914e701ecb 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp
@@ -40,7 +40,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance
 {
-    instance_black_temple(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_black_temple(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounters[ENCOUNTERS];
     std::string str_data;
@@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS) return true;
+            if (Encounters[i] == IN_PROGRESS) return true;
 
         return false;
     }
@@ -153,24 +153,24 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance
         switch(go->GetEntry())
         {
         case 185483: NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards)
-            if(Encounters[0] == DONE)HandleGameObject(NULL,true,go);break;
+            if (Encounters[0] == DONE)HandleGameObject(NULL,true,go);break;
         case 185882: MainTempleDoors = go->GetGUID();// Main Temple Doors - right past Supermoose (Supremus)
-            if(Encounters[1] == DONE)HandleGameObject(NULL,true,go);break;
+            if (Encounters[1] == DONE)HandleGameObject(NULL,true,go);break;
         case 185478: ShadeOfAkamaDoor = go->GetGUID();break;
         case 185480: CommonDoor = go->GetGUID();
-            if(Encounters[3] == DONE)HandleGameObject(NULL,true,go);;break;
+            if (Encounters[3] == DONE)HandleGameObject(NULL,true,go);;break;
         case 186153: TeronDoor = go->GetGUID();
-            if(Encounters[3] == DONE)HandleGameObject(NULL,true,go);;break;
+            if (Encounters[3] == DONE)HandleGameObject(NULL,true,go);;break;
         case 185892: GuurtogDoor = go->GetGUID();
-            if(Encounters[4] == DONE)HandleGameObject(NULL,true,go);break;
+            if (Encounters[4] == DONE)HandleGameObject(NULL,true,go);break;
         case 185479: TempleDoor = go->GetGUID();
-            if(Encounters[5] == DONE)HandleGameObject(NULL,true,go);break;
+            if (Encounters[5] == DONE)HandleGameObject(NULL,true,go);break;
         case 185482: MotherDoor = go->GetGUID();
-            if(Encounters[6] == DONE)HandleGameObject(NULL,true,go);break;
+            if (Encounters[6] == DONE)HandleGameObject(NULL,true,go);break;
         case 185481: CouncilDoor = go->GetGUID();
-            if(Encounters[7] == DONE)HandleGameObject(NULL,true,go);break;
+            if (Encounters[7] == DONE)HandleGameObject(NULL,true,go);break;
         case 186152: SimpleDoor = go->GetGUID();
-            if(Encounters[7] == DONE)HandleGameObject(NULL,true,go);break;
+            if (Encounters[7] == DONE)HandleGameObject(NULL,true,go);break;
         case 185905: IllidanGate = go->GetGUID(); break; // Gate leading to Temple Summit
         case 186261: IllidanDoor[0] = go->GetGUID(); break; // Right door at Temple Summit
         case 186262: IllidanDoor[1] = go->GetGUID(); break; // Left door at Temple Summit
@@ -208,25 +208,25 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance
         switch(type)
         {
         case DATA_HIGHWARLORDNAJENTUSEVENT:
-            if(data == DONE)
+            if (data == DONE)
             {
                 HandleGameObject(NajentusGate, true);
             }
             Encounters[0] = data;break;
         case DATA_SUPREMUSEVENT:
-            if(data == DONE)
+            if (data == DONE)
             {
                 HandleGameObject(NajentusGate, true);
             }
             Encounters[1] = data; break;
         case DATA_SHADEOFAKAMAEVENT:
-            if(data == IN_PROGRESS)
+            if (data == IN_PROGRESS)
             {
                 HandleGameObject(ShadeOfAkamaDoor, false);
             }else HandleGameObject(ShadeOfAkamaDoor, true);
             Encounters[2] = data; break;
         case DATA_TERONGOREFIENDEVENT:
-            if(data == IN_PROGRESS)
+            if (data == IN_PROGRESS)
             {
                 HandleGameObject(TeronDoor, false);
                 HandleGameObject(CommonDoor, false);
@@ -237,25 +237,25 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance
             }
             Encounters[3] = data; break;
         case DATA_GURTOGGBLOODBOILEVENT:
-            if(data == DONE)
+            if (data == DONE)
             {
                 HandleGameObject(GuurtogDoor, true);
             }
             Encounters[4] = data; break;
         case DATA_RELIQUARYOFSOULSEVENT:
-            if(data == DONE)
+            if (data == DONE)
             {
                 HandleGameObject(TempleDoor, true);
             }
             Encounters[5] = data;         break;
         case DATA_MOTHERSHAHRAZEVENT:
-            if(data == DONE)
+            if (data == DONE)
             {
                 HandleGameObject(MotherDoor, true);
             }
             Encounters[6] = data; break;
         case DATA_ILLIDARICOUNCILEVENT:
-            if(data == IN_PROGRESS)
+            if (data == IN_PROGRESS)
             {
                 HandleGameObject(CouncilDoor, false);
                 HandleGameObject(SimpleDoor, false);
@@ -331,9 +331,9 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_black_temple(Map* map)
+InstanceData* GetInstanceData_instance_black_temple(Map* pMap)
 {
-    return new instance_black_temple(map);
+    return new instance_black_temple(pMap);
 }
 
 void AddSC_instance_black_temple()
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp
index 5f1d117b61d..fb35017fbe8 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp
@@ -65,9 +65,9 @@ uint32 RingBoss[]=
     9032,                                                   // Hedrum
 };
 
-bool AreaTrigger_at_ring_of_law(Player *player, AreaTriggerEntry *at)
+bool AreaTrigger_at_ring_of_law(Player* pPlayer, AreaTriggerEntry *at)
 {
-    ScriptedInstance* pInstance = (player->GetInstanceData());
+    ScriptedInstance* pInstance = (pPlayer->GetInstanceData());
 
     if (pInstance)
     {
@@ -75,7 +75,7 @@ bool AreaTrigger_at_ring_of_law(Player *player, AreaTriggerEntry *at)
             return false;
 
         pInstance->SetData(TYPE_RING_OF_LAW,IN_PROGRESS);
-        player->SummonCreature(C_GRIMSTONE,625.559,-205.618,-52.735,2.609,TEMPSUMMON_DEAD_DESPAWN,0);
+        pPlayer->SummonCreature(C_GRIMSTONE,625.559,-205.618,-52.735,2.609,TEMPSUMMON_DEAD_DESPAWN,0);
 
         return false;
     }
@@ -339,18 +339,18 @@ struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //ThunderClap_Timer
-        if( ThunderClap_Timer < diff )
+        if (ThunderClap_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP);
             ThunderClap_Timer = 10000;
         }else ThunderClap_Timer -= diff;
 
         //FireballVolley_Timer
-        if( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51 )
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51)
         {
             if (FireballVolley_Timer < diff)
             {
@@ -360,7 +360,7 @@ struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI
         }
 
         //MightyBlow_Timer
-        if( MightyBlow_Timer < diff )
+        if (MightyBlow_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_MIGHTYBLOW);
             MightyBlow_Timer = 10000;
@@ -393,68 +393,68 @@ CreatureAI* GetAI_mob_phalanx(Creature *_Creature)
 #define GOSSIP_ITEM_KHARAN_9    "Indeed."
 #define GOSSIP_ITEM_KHARAN_10   "The door is open, Kharan. You are a free man."
 
-bool GossipHello_npc_kharan_mighthammer(Player *player, Creature *_Creature)
+bool GossipHello_npc_kharan_mighthammer(Player* pPlayer, Creature *_Creature)
 {
-    if( _Creature->isQuestGiver() )
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( player->GetQuestStatus(QUEST_4001) == QUEST_STATUS_INCOMPLETE )
-         player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(QUEST_4001) == QUEST_STATUS_INCOMPLETE)
+         pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    if( player->GetQuestStatus(4342) == QUEST_STATUS_INCOMPLETE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+    if (pPlayer->GetQuestStatus(4342) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
 
-    if (player->GetTeam() == HORDE)
-        player->SEND_GOSSIP_MENU(2473, _Creature->GetGUID());
+    if (pPlayer->GetTeam() == HORDE)
+        pPlayer->SEND_GOSSIP_MENU(2473, _Creature->GetGUID());
     else
-        player->SEND_GOSSIP_MENU(2474, _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(2474, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_kharan_mighthammer(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-             player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->SEND_GOSSIP_MENU(2475, _Creature->GetGUID());
+             pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(2475, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-            player->SEND_GOSSIP_MENU(2476, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+            pPlayer->SEND_GOSSIP_MENU(2476, _Creature->GetGUID());
             break;
 
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
-            player->SEND_GOSSIP_MENU(2477, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+            pPlayer->SEND_GOSSIP_MENU(2477, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-            player->SEND_GOSSIP_MENU(2478, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            pPlayer->SEND_GOSSIP_MENU(2478, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-             player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
-            player->SEND_GOSSIP_MENU(2479, _Creature->GetGUID());
+             pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
+            pPlayer->SEND_GOSSIP_MENU(2479, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+6:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
-            player->SEND_GOSSIP_MENU(2480, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
+            pPlayer->SEND_GOSSIP_MENU(2480, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+7:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8);
-            player->SEND_GOSSIP_MENU(2481, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8);
+            pPlayer->SEND_GOSSIP_MENU(2481, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+8:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
-            player->SEND_GOSSIP_MENU(2482, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
+            pPlayer->SEND_GOSSIP_MENU(2482, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+9:
-            player->CLOSE_GOSSIP_MENU();
-            if (player->GetTeam() == HORDE)
-                player->AreaExploredOrEventHappens(QUEST_4001);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            if (pPlayer->GetTeam() == HORDE)
+                pPlayer->AreaExploredOrEventHappens(QUEST_4001);
             else
-                player->AreaExploredOrEventHappens(QUEST_4342);
+                pPlayer->AreaExploredOrEventHappens(QUEST_4342);
             break;
     }
     return true;
@@ -472,38 +472,38 @@ bool GossipSelect_npc_kharan_mighthammer(Player *player, Creature *_Creature, ui
 #define GOSSIP_ITEM_SHOW_ACCESS     "Show me what I have access to, Lothos."
 #define GOSSIP_ITEM_GET_CONTRACT    "Get Thorium Brotherhood Contract"
 
-bool GossipHello_npc_lokhtos_darkbargainer(Player *player, Creature *_Creature)
+bool GossipHello_npc_lokhtos_darkbargainer(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (_Creature->isVendor() && player->GetReputationRank(59) >= REP_FRIENDLY)
-          player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_ITEM_SHOW_ACCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+    if (_Creature->isVendor() && pPlayer->GetReputationRank(59) >= REP_FRIENDLY)
+          pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_ITEM_SHOW_ACCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
 
-    if (player->GetQuestRewardStatus(QUEST_A_BINDING_CONTRACT) != 1 &&
-        !player->HasItemCount(ITEM_THRORIUM_BROTHERHOOD_CONTRACT, 1, true) &&
-        player->HasItemCount(ITEM_SULFURON_INGOT, 1))
+    if (pPlayer->GetQuestRewardStatus(QUEST_A_BINDING_CONTRACT) != 1 &&
+        !pPlayer->HasItemCount(ITEM_THRORIUM_BROTHERHOOD_CONTRACT, 1, true) &&
+        pPlayer->HasItemCount(ITEM_SULFURON_INGOT, 1))
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GET_CONTRACT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GET_CONTRACT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
     }
 
-    if (player->GetReputationRank(59) < REP_FRIENDLY)
-        player->SEND_GOSSIP_MENU(3673, _Creature->GetGUID());
+    if (pPlayer->GetReputationRank(59) < REP_FRIENDLY)
+        pPlayer->SEND_GOSSIP_MENU(3673, _Creature->GetGUID());
     else
-        player->SEND_GOSSIP_MENU(3677, _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(3677, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_lokhtos_darkbargainer(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)
     {
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false);
     }
     if (action == GOSSIP_ACTION_TRADE)
-        player->SEND_VENDORLIST( _Creature->GetGUID() );
+        pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
 
     return true;
 }
@@ -552,8 +552,8 @@ struct TRINITY_DLL_DECL npc_dughal_stormwingAI : public npc_escortAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
-        if( (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_ENDED )
+        if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
+        if ((pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_ENDED)
         {
             m_creature->SetVisibility(VISIBILITY_OFF);
             m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -578,22 +578,22 @@ CreatureAI* GetAI_npc_dughal_stormwing(Creature *_Creature)
 
     return dughal_stormwingAI;
 }
-bool GossipHello_npc_dughal_stormwing(Player *player, Creature *_Creature)
+bool GossipHello_npc_dughal_stormwing(Player* pPlayer, Creature *_Creature)
 {
-    if(player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS )
+    if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DUGHAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-        player->SEND_GOSSIP_MENU(2846, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DUGHAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        pPlayer->SEND_GOSSIP_MENU(2846, _Creature->GetGUID());
     }
     return true;
 }
 
-bool GossipSelect_npc_dughal_stormwing(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_dughal_stormwing(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)
     {
-        player->CLOSE_GOSSIP_MENU();
-        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, player->GetGUID());
+        pPlayer->CLOSE_GOSSIP_MENU();
+        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, pPlayer->GetGUID());
         _Creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
         pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS);
     }
@@ -615,7 +615,7 @@ bool GossipSelect_npc_dughal_stormwing(Player *player, Creature *_Creature, uint
 #define SAY_WINDSOR_9               "Ah, there it is!"
 #define MOB_ENTRY_REGINALD_WINDSOR  9682
 
-Player* PlayerStart;
+Player* pPlayerStart;
 /*
 struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI
 {
@@ -626,7 +626,7 @@ struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-    switch( i )
+    switch(i)
         {
         case 1:
             m_creature->Say(SAY_WINDSOR_1, LANG_UNIVERSAL, PlayerGUID);
@@ -688,20 +688,20 @@ struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
-        if(pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED)
+        if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
+        if (pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED)
             IsOnHold = false;
-        if(!pInstance->GetData(DATA_GATE_D) && pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_NOT_STARTED )
+        if (!pInstance->GetData(DATA_GATE_D) && pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_NOT_STARTED)
             {
             m_creature->Say(SAY_WINDSOR_4_2, LANG_UNIVERSAL, PlayerGUID);
             pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_BEFORE_START);
             }
-        if( pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED )
+        if (pInstance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED)
             {
             m_creature->Say(SAY_WINDSOR_4_3, LANG_UNIVERSAL, PlayerGUID);
             pInstance->SetData(DATA_DUGHAL, ENCOUNTER_STATE_ENDED);
             }
-        if( (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& pInstance->GetData(DATA_SUPPLY_ROOM) == ENCOUNTER_STATE_ENDED )
+        if ((pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& pInstance->GetData(DATA_SUPPLY_ROOM) == ENCOUNTER_STATE_ENDED)
         {
             m_creature->SetVisibility(VISIBILITY_OFF);
             m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -744,13 +744,13 @@ CreatureAI* GetAI_npc_marshal_windsor(Creature *_Creature)
     return marshal_windsorAI;
 }
 
-bool QuestAccept_npc_marshal_windsor(Player *player, Creature *creature, Quest const *quest )
+bool QuestAccept_npc_marshal_windsor(Player* pPlayer, Creature *creature, Quest const *quest)
 {
-    if( quest->GetQuestId() == 4322 )
+    if (quest->GetQuestId() == 4322)
         {PlayerStart = player;
-        if( pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED )
+        if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED)
         {
-                CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
+                CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
                 pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS);
                 creature->setFaction(11);
         }
@@ -791,7 +791,7 @@ struct TRINITY_DLL_DECL npc_marshal_reginald_windsorAI : public npc_escortAI
     void WaypointReached(uint32 i)
     {
     wp=i;
-    switch( i )
+    switch(i)
         {
         case 0:
             m_creature->setFaction(11);
@@ -848,15 +848,15 @@ struct TRINITY_DLL_DECL npc_marshal_reginald_windsorAI : public npc_escortAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if( IsBeingEscorted )
+        if (IsBeingEscorted)
             return;
 
-        if( who->GetTypeId() == TYPEID_PLAYER )
+        if (who->GetTypeId() == TYPEID_PLAYER)
         {
-            if( CAST_PLR(who)->GetQuestStatus(4322) == QUEST_STATUS_INCOMPLETE )
+            if (CAST_PLR(who)->GetQuestStatus(4322) == QUEST_STATUS_INCOMPLETE)
             {
                 float Radius = 10.0;
-                if( m_creature->IsWithinDistInMap(who, Radius) )
+                if (m_creature->IsWithinDistInMap(who, Radius))
                 {
                     IsOnHold = false;
                     Start(true, false, who->GetGUID());
@@ -883,48 +883,48 @@ struct TRINITY_DLL_DECL npc_marshal_reginald_windsorAI : public npc_escortAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
-        if(wp==7)
+        if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
+        if (wp==7)
             {
-            if(!pInstance->GetData(DATA_GATE_J) && pInstance->GetData(DATA_JAZ) == ENCOUNTER_STATE_NOT_STARTED )
+            if (!pInstance->GetData(DATA_GATE_J) && pInstance->GetData(DATA_JAZ) == ENCOUNTER_STATE_NOT_STARTED)
                 {
                     pInstance->SetData(DATA_CREATURE_JAZ,1);
                     pInstance->SetData(DATA_JAZ,ENCOUNTER_STATE_IN_PROGRESS);
                 }
-            if( pInstance->GetData(DATA_CREATURE_JAZ) && pInstance->GetData(DATA_CREATURE_OGRABISI) && pInstance->GetData(DATA_JAZ) == ENCOUNTER_STATE_IN_PROGRESS )
+            if (pInstance->GetData(DATA_CREATURE_JAZ) && pInstance->GetData(DATA_CREATURE_OGRABISI) && pInstance->GetData(DATA_JAZ) == ENCOUNTER_STATE_IN_PROGRESS)
                 {
                     IsOnHold = false;
                     pInstance->SetData(DATA_JAZ,ENCOUNTER_STATE_ENDED);
                 }
             }
-        else if(wp==11)
+        else if (wp==11)
             {
-            if(!pInstance->GetData(DATA_GATE_S) && pInstance->GetData(DATA_SHILL) == ENCOUNTER_STATE_NOT_STARTED )
+            if (!pInstance->GetData(DATA_GATE_S) && pInstance->GetData(DATA_SHILL) == ENCOUNTER_STATE_NOT_STARTED)
                 {
                     pInstance->SetData(DATA_CREATURE_SHILL,1);
                     pInstance->SetData(DATA_SHILL,ENCOUNTER_STATE_IN_PROGRESS);
                 }
-            if( pInstance->GetData(DATA_CREATURE_SHILL) && pInstance->GetData(DATA_SHILL) == ENCOUNTER_STATE_IN_PROGRESS )
+            if (pInstance->GetData(DATA_CREATURE_SHILL) && pInstance->GetData(DATA_SHILL) == ENCOUNTER_STATE_IN_PROGRESS)
                 {
                     pInstance->SetData(DATA_SHILL,ENCOUNTER_STATE_ENDED);
                     IsOnHold = false;
                 }
             }
-        else if(wp==20)
+        else if (wp==20)
             {
-            if(!pInstance->GetData(DATA_GATE_C) && pInstance->GetData(DATA_CREST) == ENCOUNTER_STATE_NOT_STARTED)
+            if (!pInstance->GetData(DATA_GATE_C) && pInstance->GetData(DATA_CREST) == ENCOUNTER_STATE_NOT_STARTED)
                 {
                     pInstance->SetData(DATA_CREATURE_CREST,1);
                     m_creature->Say(SAY_REGINALD_WINDSOR_13_2, LANG_UNIVERSAL, PlayerGUID);
                     pInstance->SetData(DATA_CREST,ENCOUNTER_STATE_IN_PROGRESS);
                 }
-            if( pInstance->GetData(DATA_CREATURE_CREST) && pInstance->GetData(DATA_CREST) == ENCOUNTER_STATE_IN_PROGRESS )
+            if (pInstance->GetData(DATA_CREATURE_CREST) && pInstance->GetData(DATA_CREST) == ENCOUNTER_STATE_IN_PROGRESS)
                 {
                     IsOnHold = false;
                     pInstance->SetData(DATA_CREST,ENCOUNTER_STATE_ENDED);
                 }
             }
-        if( pInstance->GetData(DATA_TOBIAS)==ENCOUNTER_STATE_OBJECTIVE_COMPLETED ) IsOnHold = false;
+        if (pInstance->GetData(DATA_TOBIAS)==ENCOUNTER_STATE_OBJECTIVE_COMPLETED) IsOnHold = false;
         npc_escortAI::UpdateAI(diff);
     }
 };
@@ -1013,8 +1013,8 @@ struct TRINITY_DLL_DECL npc_tobias_seecherAI : public npc_escortAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
-        if( (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& pInstance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_ENDED )
+        if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return;
+        if ((pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& pInstance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_ENDED)
         {
             m_creature->SetVisibility(VISIBILITY_OFF);
             m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -1043,22 +1043,22 @@ CreatureAI* GetAI_npc_tobias_seecher(Creature *_Creature)
     return tobias_seecherAI;
 }
 
-bool GossipHello_npc_tobias_seecher(Player *player, Creature *_Creature)
+bool GossipHello_npc_tobias_seecher(Player* pPlayer, Creature *_Creature)
 {
-    if(player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS )
+    if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Get out of here, Tobias, you're free!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-        player->SEND_GOSSIP_MENU(2847, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Get out of here, Tobias, you're free!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        pPlayer->SEND_GOSSIP_MENU(2847, _Creature->GetGUID());
     }
     return true;
 }
 
-bool GossipSelect_npc_tobias_seecher(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_tobias_seecher(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)
     {
-        player->CLOSE_GOSSIP_MENU();
-        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, player->GetGUID());
+        pPlayer->CLOSE_GOSSIP_MENU();
+        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, pPlayer->GetGUID());
         _Creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
         pInstance->SetData(DATA_TOBIAS,ENCOUNTER_STATE_IN_PROGRESS);
     }
@@ -1174,7 +1174,7 @@ CreatureAI* GetAI_npc_rocknot(Creature *_Creature)
     return Rocknot_AI;
 }
 
-bool ChooseReward_npc_rocknot(Player *player, Creature *_Creature, const Quest *_Quest, uint32 item)
+bool ChooseReward_npc_rocknot(Player* pPlayer, Creature *_Creature, const Quest *_Quest, uint32 item)
 {
     ScriptedInstance* pInstance = (_Creature->GetInstanceData());
 
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp
index d08cbb06b98..e24493c3c71 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp
@@ -60,14 +60,14 @@ struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI
             case 1: RandY += Rand; break;
         }
         Summoned = DoSpawnCreature(9178, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
-        if(Summoned)
+        if (Summoned)
             (Summoned->AI())->AttackStart(victim);
     }
 
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //FireBlast_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp
index a65d41e3170..7bb97c59b2e 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp
@@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //ShadowBolt_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
index 0e0639fa14a..94a018ec151 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
@@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (HandOfThaurissan_Timer < diff)
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp
index 5d47241a5d9..cbbdc237c27 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp
@@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI
         }
         Rand1 = 0;
         SummonedAdds = DoSpawnCreature(8901, Rand1X, Rand1Y, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
-        if(SummonedAdds)
+        if (SummonedAdds)
             (SummonedAdds->AI())->AttackStart(victim);
     }
 
@@ -96,14 +96,14 @@ struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI
         }
         Rand2 = 0;
         SummonedMedics = DoSpawnCreature(8894, Rand2X, Rand2Y, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
-        if(SummonedMedics)
+        if (SummonedMedics)
             (SummonedMedics->AI())->AttackStart(victim);
     }
 
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //MightyBlow_Timer
@@ -128,7 +128,7 @@ struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI
         }else Cleave_Timer -= diff;
 
         //Adds_Timer
-        if ( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 21 )
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 21)
         {
             if (Adds_Timer < diff)
             {
@@ -142,7 +142,7 @@ struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI
         }
 
         //Summon Medics
-        if ( !Medics && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 21 )
+        if (!Medics && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 21)
         {
             SummonMedics(m_creature->getVictim());
             SummonMedics(m_creature->getVictim());
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp
index 6a89906faf7..3895605010f 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp
@@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //WhirlWind_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp
index 5aa3786efce..0791c3dfe36 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp
@@ -48,7 +48,7 @@ struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //GroundTremor_Timer
@@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI
         }else GroundTremor_Timer -= diff;
 
         //Frenzy_Timer
-        if ( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51 )
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51)
         {
             if (Frenzy_Timer < diff)
             {
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp
index 62ba94347d4..05f62558d03 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp
@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //ShadowWordPain_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp
index f9016987dfa..52e985f7f04 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp
@@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //FieryBurst_Timer
@@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI
         }else FieryBurst_Timer -= diff;
 
         //WarStomp_Timer
-        if ( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51 )
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51)
         {
             if (WarStomp_Timer < diff)
             {
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp
index b60ad5cdbe5..b71d4c17007 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp
@@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //MindBlast_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp
index 09da8f07b75..cc6822a50c1 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp
@@ -60,16 +60,16 @@ struct TRINITY_DLL_DECL boss_angerrelAI : public ScriptedAI
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreaturesAddon();
-        if(m_creature->isAlive())
+        if (m_creature->isAlive())
             m_creature->GetMotionMaster()->MoveTargetedHome();
         m_creature->SetLootRecipient(NULL);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData64(DATA_EVENSTARTER, 0);
     }
 
     void JustDied(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GHOSTKILL, 1);
     }
 
@@ -144,16 +144,16 @@ struct TRINITY_DLL_DECL boss_doperelAI : public ScriptedAI
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreaturesAddon();
-        if(m_creature->isAlive())
+        if (m_creature->isAlive())
             m_creature->GetMotionMaster()->MoveTargetedHome();
         m_creature->SetLootRecipient(NULL);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData64(DATA_EVENSTARTER, 0);
     }
 
     void JustDied(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GHOSTKILL, 1);
     }
 
@@ -230,16 +230,16 @@ struct TRINITY_DLL_DECL boss_haterelAI : public ScriptedAI
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreaturesAddon();
-        if(m_creature->isAlive())
+        if (m_creature->isAlive())
             m_creature->GetMotionMaster()->MoveTargetedHome();
         m_creature->SetLootRecipient(NULL);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData64(DATA_EVENSTARTER, 0);
     }
 
     void JustDied(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GHOSTKILL, 1);
     }
 
@@ -327,16 +327,16 @@ struct TRINITY_DLL_DECL boss_vilerelAI : public ScriptedAI
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreaturesAddon();
-        if(m_creature->isAlive())
+        if (m_creature->isAlive())
             m_creature->GetMotionMaster()->MoveTargetedHome();
         m_creature->SetLootRecipient(NULL);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData64(DATA_EVENSTARTER, 0);
     }
 
     void JustDied(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GHOSTKILL, 1);
     }
 
@@ -426,16 +426,16 @@ struct TRINITY_DLL_DECL boss_seethrelAI : public ScriptedAI
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreaturesAddon();
-        if(m_creature->isAlive())
+        if (m_creature->isAlive())
             m_creature->GetMotionMaster()->MoveTargetedHome();
         m_creature->SetLootRecipient(NULL);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData64(DATA_EVENSTARTER, 0);
     }
 
     void JustDied(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GHOSTKILL, 1);
     }
 
@@ -528,22 +528,22 @@ struct TRINITY_DLL_DECL boss_gloomrelAI : public ScriptedAI
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreaturesAddon();
-        if(m_creature->isAlive())
+        if (m_creature->isAlive())
             m_creature->GetMotionMaster()->MoveTargetedHome();
         m_creature->SetLootRecipient(NULL);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData64(DATA_EVENSTARTER, 0);
     }
 
     void JustDied(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GHOSTKILL, 1);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Hamstring_Timer
@@ -580,36 +580,36 @@ CreatureAI* GetAI_boss_gloomrel(Creature *_Creature)
 #define GOSSIP_ITEM_TEACH_2 "Continue..."
 #define GOSSIP_ITEM_TRIBUTE "I want to pay tribute"
 
-bool GossipHello_boss_gloomrel(Player *player, Creature *_Creature)
+bool GossipHello_boss_gloomrel(Player* pPlayer, Creature *_Creature)
 {
-    if (player->GetQuestRewardStatus(4083) == 1 && player->GetSkillValue(SKILL_MINING) >= 230 && !player->HasSpell(14891) )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    if (pPlayer->GetQuestRewardStatus(4083) == 1 && pPlayer->GetSkillValue(SKILL_MINING) >= 230 && !pPlayer->HasSpell(14891))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
 
-    if (player->GetQuestRewardStatus(4083) == 0 && player->GetSkillValue(SKILL_MINING) >= 230)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TRIBUTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    if (pPlayer->GetQuestRewardStatus(4083) == 0 && pPlayer->GetSkillValue(SKILL_MINING) >= 230)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TRIBUTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_boss_gloomrel(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_boss_gloomrel(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->SEND_GOSSIP_MENU(2606, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->SEND_GOSSIP_MENU(2606, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+11:
-            player->CLOSE_GOSSIP_MENU();
-            _Creature->CastSpell(player, 14894, false);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            _Creature->CastSpell(pPlayer, 14894, false);
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
-            player->SEND_GOSSIP_MENU(2604, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
+            pPlayer->SEND_GOSSIP_MENU(2604, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+22:
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CLOSE_GOSSIP_MENU();
             if (ScriptedInstance* pInstance = _Creature->GetInstanceData())
             {
                 //are 5 minutes expected? go template may have data to despawn when used at quest
@@ -660,8 +660,8 @@ struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI
         // was set before event start, so set again
         m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
 
-        if(pInstance)
-            if(pInstance->GetData(DATA_GHOSTKILL) >= 7)
+        if (pInstance)
+            if (pInstance->GetData(DATA_GHOSTKILL) >= 7)
                 m_creature->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
             else
                 m_creature->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@@ -677,22 +677,22 @@ struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI
         m_creature->DeleteThreatList();
         m_creature->CombatStop(true);
         m_creature->LoadCreaturesAddon();
-        if(m_creature->isAlive())
+        if (m_creature->isAlive())
             m_creature->GetMotionMaster()->MoveTargetedHome();
         m_creature->SetLootRecipient(NULL);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData64(DATA_EVENSTARTER, 0);
     }
 
     void JustDied(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GHOSTKILL, 1);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //ShadowVolley_Timer
@@ -726,7 +726,7 @@ struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI
         }else DemonArmor_Timer -= diff;
 
         //Summon Voidwalkers
-        if (!Voidwalkers && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51 )
+        if (!Voidwalkers && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51)
         {
             m_creature->CastSpell(m_creature->getVictim(), SPELL_SUMMON_VOIDWALKERS, true);
             Voidwalkers = true;
@@ -743,31 +743,31 @@ CreatureAI* GetAI_boss_doomrel(Creature *_Creature)
 
 #define GOSSIP_ITEM_CHALLENGE   "Your bondage is at an end, Doom'rel. I challenge you!"
 
-bool GossipHello_boss_doomrel(Player *player, Creature *_Creature)
+bool GossipHello_boss_doomrel(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->SEND_GOSSIP_MENU(2601, _Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->SEND_GOSSIP_MENU(2601, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_boss_doomrel(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_boss_doomrel(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(2605, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(2605, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CLOSE_GOSSIP_MENU();
             //start event here
             _Creature->setFaction(FACTION_HOSTILE);
             _Creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
-            _Creature->AI()->AttackStart(player);
+            _Creature->AI()->AttackStart(pPlayer);
             ScriptedInstance* pInstance = _Creature->GetInstanceData();
-            if(pInstance)
-                pInstance->SetData64(DATA_EVENSTARTER,player->GetGUID());
+            if (pInstance)
+                pInstance->SetData64(DATA_EVENSTARTER,pPlayer->GetGUID());
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp
index abf6701088c..5bef7336cea 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp
@@ -72,7 +72,7 @@ enum
 
 struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
 {
-    instance_blackrock_depths(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_blackrock_depths(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounter[ENCOUNTERS];
     std::string str_data;
@@ -176,7 +176,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
         case GO_TOMB_ENTER: GoTombEnterGUID = go->GetGUID(); break;
         case GO_TOMB_EXIT: 
             GoTombExitGUID = go->GetGUID();
-            if(GhostKillCount >= 7)
+            if (GhostKillCount >= 7)
                 HandleGameObject(0, true, go);
             else
                 HandleGameObject(0, false, go);
@@ -197,7 +197,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
         {
         case DATA_EVENSTARTER:
             TombEventStarterGUID = data;
-            if(!TombEventStarterGUID)
+            if (!TombEventStarterGUID)
                 TombOfSevenReset();//reset
             else
                 TombOfSevenStart();//start
@@ -327,9 +327,9 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
             if (Encounter[i] == IN_PROGRESS)
                 Encounter[i] = NOT_STARTED;
-        if(GhostKillCount > 0 && GhostKillCount < 7)
+        if (GhostKillCount > 0 && GhostKillCount < 7)
             GhostKillCount = 0;//reset tomb of seven event
-        if(GhostKillCount > 7)
+        if (GhostKillCount > 7)
             GhostKillCount = 7;
 
         OUT_LOAD_INST_DATA_COMPLETE;
@@ -337,13 +337,13 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
 
     void TombOfSevenEvent()
     {
-        if(GhostKillCount < 7 && TombBossGUIDs[TombEventCounter])
+        if (GhostKillCount < 7 && TombBossGUIDs[TombEventCounter])
         {
-            if(Creature* boss = instance->GetCreature(TombBossGUIDs[TombEventCounter]))
+            if (Creature* boss = instance->GetCreature(TombBossGUIDs[TombEventCounter]))
             {
                 boss->setFaction(FACTION_HOSTILE);
                 boss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
-                if(Unit* target = boss->SelectNearestTarget(500))
+                if (Unit* target = boss->SelectNearestTarget(500))
                     boss->AI()->AttackStart(target);
             }
         }        
@@ -355,9 +355,9 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
         HandleGameObject(GoTombEnterGUID,true);//event reseted, open entrance door
         for(uint8 i = 0; i < 7; ++i)
         {
-            if(Creature* boss = instance->GetCreature(TombBossGUIDs[i]))
+            if (Creature* boss = instance->GetCreature(TombBossGUIDs[i]))
             {
-                if(!boss->isAlive())
+                if (!boss->isAlive())
                 {//do not call EnterEvadeMode(), it will create infinit loops
                     boss->Respawn();
                     boss->RemoveAllAuras();
@@ -394,23 +394,23 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
     }
     void Update(uint32 diff)
     {
-        if(TombEventStarterGUID && GhostKillCount < 7)
+        if (TombEventStarterGUID && GhostKillCount < 7)
         {
-            if(TombTimer <= diff)
+            if (TombTimer <= diff)
             {
                 TombTimer = TIMER_TOMBOFTHESEVEN;
                 TombEventCounter++;
                 TombOfSevenEvent();
             }else TombTimer -= diff;
         }
-        if(GhostKillCount >= 7 && TombEventStarterGUID)
+        if (GhostKillCount >= 7 && TombEventStarterGUID)
             TombOfSevenEnd();
     }
 };
 
-InstanceData* GetInstanceData_instance_blackrock_depths(Map* map)
+InstanceData* GetInstanceData_instance_blackrock_depths(Map* pMap)
 {
-    return new instance_blackrock_depths(map);
+    return new instance_blackrock_depths(pMap);
 }
 
    void AddSC_instance_blackrock_depths()
diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp
index cf199073b77..29eb7e39c73 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp
@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_drakkisathAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //FireNova_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp
index 196077a1292..b8f8a9fad2d 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp
@@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI
         //char buf[200];
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (!RootSelf)
@@ -174,7 +174,7 @@ struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI
 
             //Summon Rend
             if (!SummonedRend && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 11
-                && m_creature->GetHealth() > 0 )
+                && m_creature->GetHealth() > 0)
             {
                 //summon Rend and Change model to normal Gyth
                 //Inturrupt any spell casting
diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp
index f5f7e11f7db..c48edc0a942 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp
@@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_halyconAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //CrowdPummel_Timer
@@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_halyconAI : public ScriptedAI
         }else MightyBlow_Timer -= diff;
 
         //Summon Gizrul
-        if ( !Summoned && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 25 )
+        if (!Summoned && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 25)
         {
             m_creature->SummonCreature(10268,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,300000);
             Summoned = true;
diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp
index e84d538bf79..6d4c6d1f09e 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp
@@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL boss_highlordomokkAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //WarStomp_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp
index 749ff71f024..f88f33ac530 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp
@@ -44,25 +44,25 @@ struct TRINITY_DLL_DECL boss_mothersmolderwebAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if( m_creature->GetHealth() <= damage )
+        if (m_creature->GetHealth() <= damage)
             m_creature->CastSpell(m_creature,SPELL_SUMMON_SPIRE_SPIDERLING,true);
     }
 
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Crystalize_Timer
-        if( Crystalize_Timer < diff )
+        if (Crystalize_Timer < diff)
         {
             DoCast(m_creature,SPELL_CRYSTALIZE);
             Crystalize_Timer = 15000;
         }else Crystalize_Timer -= diff;
 
         //MothersMilk_Timer
-        if( MothersMilk_Timer < diff )
+        if (MothersMilk_Timer < diff)
         {
             DoCast(m_creature,SPELL_MOTHERSMILK);
             MothersMilk_Timer = 5000+rand()%7500;
diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp
index 98ed58f0b3a..2b05c0dd548 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp
@@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //BlastWave_Timer
@@ -97,16 +97,16 @@ struct TRINITY_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI
         }else Knockaway_Timer -= diff;
 
         //Summon two Beserks
-        if ( !Summoned && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51 )
+        if (!Summoned && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51)
         {
             Unit* target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM,0);
 
             SummonedCreature = m_creature->SummonCreature(9216,ADD_1X,ADD_1Y,ADD_1Z,ADD_1O,TEMPSUMMON_TIMED_DESPAWN,300000);
-            if(SummonedCreature)
+            if (SummonedCreature)
             (SummonedCreature->AI())->AttackStart(target);
             SummonedCreature = m_creature->SummonCreature(9268,ADD_2X,ADD_2Y,ADD_2Z,ADD_2O,TEMPSUMMON_TIMED_DESPAWN,300000);
-            if(SummonedCreature)
+            if (SummonedCreature)
             (SummonedCreature->AI())->AttackStart(target);
             Summoned = true;
         }
diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp
index 474a3ffcfdd..5edc668ad17 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp
@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //FireNova_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp
index d244567eafa..7fc8e866444 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp
@@ -50,7 +50,7 @@ struct TRINITY_DLL_DECL boss_quatermasterzigrisAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Shoot_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp
index 58f487f846d..9ac7c9f9556 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp
@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_rend_blackhandAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //WhirlWind_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
index 43417a6996c..5b095eb0d73 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
@@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //CurseOfBlood_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp
index 38bdd2f2c55..eb0024d7629 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp
@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_thebeastAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Flamebreak_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp
index 358e33969dd..2e45b414e7c 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp
@@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_warmastervooneAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Snapkick_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp
index 555a0825b50..bed6d44b9e7 100644
--- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp
+++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp
@@ -189,7 +189,7 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Shimmer_Timer Timer
diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp
index 90ff9b9b967..518bf147288 100644
--- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp
+++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp
@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_ebonrocAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Shadowflame Timer
diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp
index 0af2c66b54f..14c3678accd 100644
--- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp
+++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp
@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_firemawAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //ShadowFlame_Timer
@@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL boss_firemawAI : public ScriptedAI
         if (WingBuffet_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_WINGBUFFET);
-            if(DoGetThreat(m_creature->getVictim()))
+            if (DoGetThreat(m_creature->getVictim()))
                 DoModifyThreatPercent(m_creature->getVictim(),-75);
 
             WingBuffet_Timer = 25000;
diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp
index 87ce0e3fb3b..2811773903e 100644
--- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp
+++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp
@@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //ShadowFlame_Timer
@@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI
         if (WingBuffet_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_WINGBUFFET);
-            if(DoGetThreat(m_creature->getVictim()))
+            if (DoGetThreat(m_creature->getVictim()))
                 DoModifyThreatPercent(m_creature->getVictim(),-75);
 
             WingBuffet_Timer = 25000;
diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp
index c71b1871d94..e5058a33866 100644
--- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp
+++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp
@@ -109,7 +109,7 @@ struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //ShadowFlame_Timer
diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp
index 77e22a4d543..3f67b98fc65 100644
--- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp
+++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp
@@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Cleave_Timer
@@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI
             DoCast(m_creature->getVictim(),SPELL_CONFLAGRATION);
             //We will remove this threat reduction and add an aura check.
 
-            //if(DoGetThreat(m_creature->getVictim()))
+            //if (DoGetThreat(m_creature->getVictim()))
             //DoModifyThreatPercent(m_creature->getVictim(),-50);
 
             Conflagration_Timer = 12000;
diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp
index a1b87ae6f01..e9dea7122bc 100644
--- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp
+++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp
@@ -138,7 +138,7 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         // Yell if hp lower than 15%
@@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
         if (TailSwipe_Timer < diff)
         {
             //Only cast if we are behind
-            /*if (!m_creature->HasInArc( M_PI, m_creature->getVictim()))
+            /*if (!m_creature->HasInArc(M_PI, m_creature->getVictim()))
             {
             DoCast(m_creature->getVictim(),SPELL_TAILSWIPE);
             }*/
@@ -215,27 +215,27 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
     }
 };
 
-void SendDefaultMenu_boss_vael(Player *player, Creature *_Creature, uint32 action)
+void SendDefaultMenu_boss_vael(Player* pPlayer, Creature *_Creature, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)               //Fight time
     {
-        player->CLOSE_GOSSIP_MENU();
-        CAST_AI(boss_vaelAI, _Creature->AI())->BeginSpeach(player);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        CAST_AI(boss_vaelAI, _Creature->AI())->BeginSpeach(pPlayer);
     }
 }
 
-bool GossipSelect_boss_vael(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_boss_vael(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (sender == GOSSIP_SENDER_MAIN)
-        SendDefaultMenu_boss_vael(player, _Creature, action);
+        SendDefaultMenu_boss_vael(pPlayer, _Creature, action);
 
     return true;
 }
 
-bool GossipHello_boss_vael(Player *player, Creature *_Creature)
+bool GossipHello_boss_vael(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->SEND_GOSSIP_MENU(907,_Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM        , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->SEND_GOSSIP_MENU(907,_Creature->GetGUID());
 
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp
index c9f35964fa8..d96c0b9785b 100644
--- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp
+++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp
@@ -209,7 +209,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        //We simply use this function to find players until we can use Map->GetPlayers()
+        //We simply use this function to find players until we can use pMap->GetPlayers()
 
         if (who && who->GetTypeId() == TYPEID_PLAYER && m_creature->IsHostileTo(who))
         {
@@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Only do this if we haven't spawned nef yet
@@ -350,29 +350,29 @@ CreatureAI* GetAI_boss_victor_nefarius(Creature *_Creature)
     return new boss_victor_nefariusAI (_Creature);
 }
 
-bool GossipHello_boss_victor_nefarius(Player *player, Creature *_Creature)
+bool GossipHello_boss_victor_nefarius(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-    player->SEND_GOSSIP_MENU(7134,_Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    pPlayer->SEND_GOSSIP_MENU(7134,_Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_boss_victor_nefarius(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_boss_victor_nefarius(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->SEND_GOSSIP_MENU(7198, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(7198, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-            player->SEND_GOSSIP_MENU(7199, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+            pPlayer->SEND_GOSSIP_MENU(7199, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CLOSE_GOSSIP_MENU();
             DoScriptText(SAY_GAMESBEGIN_1, _Creature);
-            CAST_AI(boss_victor_nefariusAI, _Creature->AI())->BeginEvent(player);
+            CAST_AI(boss_victor_nefariusAI, _Creature->AI())->BeginEvent(pPlayer);
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp
index 946290d6294..f038346371a 100644
--- a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp
+++ b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp
@@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI
             return;
         }
 
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (IntangiblePresence_Timer <= diff)
@@ -281,22 +281,22 @@ CreatureAI* GetAI_npc_daranelle(Creature *_Creature)
 ## npc_overseer_nuaar
 ######*/
 
-bool GossipHello_npc_overseer_nuaar(Player *player, Creature *_Creature)
+bool GossipHello_npc_overseer_nuaar(Player* pPlayer, Creature *_Creature)
 {
-    if (player->GetQuestStatus(10682) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Overseer, I am here to negotiate on behalf of the Cenarion Expedition.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(10682) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Overseer, I am here to negotiate on behalf of the Cenarion Expedition.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(10532, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(10532, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_overseer_nuaar(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_overseer_nuaar(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->SEND_GOSSIP_MENU(10533, _Creature->GetGUID());
-        player->AreaExploredOrEventHappens(10682);
+        pPlayer->SEND_GOSSIP_MENU(10533, _Creature->GetGUID());
+        pPlayer->AreaExploredOrEventHappens(10682);
     }
     return true;
 }
@@ -305,27 +305,27 @@ bool GossipSelect_npc_overseer_nuaar(Player *player, Creature *_Creature, uint32
 ## npc_saikkal_the_elder
 ######*/
 
-bool GossipHello_npc_saikkal_the_elder(Player *player, Creature *_Creature)
+bool GossipHello_npc_saikkal_the_elder(Player* pPlayer, Creature *_Creature)
 {
-    if (player->GetQuestStatus(10980) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes... yes, it's me.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(10980) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes... yes, it's me.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(10794, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(10794, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_saikkal_the_elder(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_saikkal_the_elder(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes elder. Tell me more of the book.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->SEND_GOSSIP_MENU(10795, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes elder. Tell me more of the book.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(10795, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
-            player->SEND_GOSSIP_MENU(10796, _Creature->GetGUID());
+            pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(10796, _Creature->GetGUID());
             break;
     }
     return true;
@@ -335,11 +335,11 @@ bool GossipSelect_npc_saikkal_the_elder(Player *player, Creature *_Creature, uin
 ## go_legion_obelisk
 ######*/
 
-bool GOHello_go_legion_obelisk(Player *player, GameObject* _GO)
+bool GOHello_go_legion_obelisk(Player* pPlayer, GameObject* _GO)
 {    
-    if ( player->GetQuestStatus(10821) == QUEST_STATUS_INCOMPLETE )
+    if (pPlayer->GetQuestStatus(10821) == QUEST_STATUS_INCOMPLETE)
     {
-        switch( _GO->GetEntry() )
+        switch(_GO->GetEntry())
         {
             case LEGION_OBELISK_ONE:
                   obelisk_one = true;
@@ -358,7 +358,7 @@ bool GOHello_go_legion_obelisk(Player *player, GameObject* _GO)
                  break;
         }
     
-        if ( obelisk_one == true && obelisk_two == true && obelisk_three == true && obelisk_four == true && obelisk_five == true )
+        if (obelisk_one == true && obelisk_two == true && obelisk_three == true && obelisk_four == true && obelisk_five == true)
         {
             _GO->SummonCreature(19963,2943.40f,4778.20f,284.49f,0.94f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000);
             //reset global var
diff --git a/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp b/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp
index 37338aa4913..406ae983559 100644
--- a/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp
+++ b/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp
@@ -38,22 +38,22 @@ EndContentData */
 #define SPELL_TELEPORT_SINGLE_IN_GROUP  13142
 #define SPELL_TELEPORT_GROUP            27686
 
-bool GossipHello_npc_deathly_usher(Player *player, Creature *_Creature)
+bool GossipHello_npc_deathly_usher(Player* pPlayer, Creature *_Creature)
 {
-    if(player->GetQuestStatus(3628) == QUEST_STATUS_INCOMPLETE && player->HasItemCount(10757, 1))
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_USHER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(3628) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(10757, 1))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_USHER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_deathly_usher(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_deathly_usher(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if(action == GOSSIP_ACTION_INFO_DEF)
+    if (action == GOSSIP_ACTION_INFO_DEF)
     {
-        player->CLOSE_GOSSIP_MENU();
-        _Creature->CastSpell(player, SPELL_TELEPORT_SINGLE, true);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        _Creature->CastSpell(pPlayer, SPELL_TELEPORT_SINGLE, true);
     }
 
     return true;
@@ -73,71 +73,71 @@ bool GossipSelect_npc_deathly_usher(Player *player, Creature *_Creature, uint32
 #define GOSSIP_ITEM_FALLEN4 "You can count on me, Hero"
 #define GOSSIP_ITEM_FALLEN5 "I shall"
 
-bool GossipHello_npc_fallen_hero_of_horde(Player *player, Creature *_Creature)
+bool GossipHello_npc_fallen_hero_of_horde(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    if (player->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && player->GetTeam() == HORDE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+    if (pPlayer->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && pPlayer->GetTeam() == HORDE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
 
-    if (player->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && player->GetTeam() == ALLIANCE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && pPlayer->GetTeam() == ALLIANCE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_fallen_hero_of_horde(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_fallen_hero_of_horde(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->SEND_GOSSIP_MENU(1392, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->SEND_GOSSIP_MENU(1392, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+11:
-            player->SEND_GOSSIP_MENU(1411, _Creature->GetGUID());
-            if (player->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
-                player->AreaExploredOrEventHappens(2784);
-            if (player->GetTeam() == ALLIANCE)
+            pPlayer->SEND_GOSSIP_MENU(1411, _Creature->GetGUID());
+            if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
+                pPlayer->AreaExploredOrEventHappens(2784);
+            if (pPlayer->GetTeam() == ALLIANCE)
             {
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-                player->SEND_GOSSIP_MENU(1411, _Creature->GetGUID());
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+                pPlayer->SEND_GOSSIP_MENU(1411, _Creature->GetGUID());
             }
             break;
 
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
-            player->SEND_GOSSIP_MENU(1451, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
+            pPlayer->SEND_GOSSIP_MENU(1451, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+21:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
-            player->SEND_GOSSIP_MENU(1452, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
+            pPlayer->SEND_GOSSIP_MENU(1452, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+22:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
-            player->SEND_GOSSIP_MENU(1453, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
+            pPlayer->SEND_GOSSIP_MENU(1453, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+23:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
-            player->SEND_GOSSIP_MENU(1454, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
+            pPlayer->SEND_GOSSIP_MENU(1454, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+24:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
-            player->SEND_GOSSIP_MENU(1455, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
+            pPlayer->SEND_GOSSIP_MENU(1455, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+25:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26);
-            player->SEND_GOSSIP_MENU(1456, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26);
+            pPlayer->SEND_GOSSIP_MENU(1456, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+26:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(2801);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(2801);
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp b/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp
index 525570e37e2..f7989b3af01 100644
--- a/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp
+++ b/src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp
@@ -86,14 +86,14 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI
         }
         Rand = 0;
         Summoned = DoSpawnCreature(19207, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 300000);
-        if(Summoned)
+        if (Summoned)
             (Summoned->AI())->AttackStart(victim);
     }
 
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //ShadowVolley_Timer
diff --git a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp
index b13330d4bd6..4dd4185bc90 100644
--- a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp
+++ b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp
@@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL mob_webbed_creatureAI : public ScriptedAI
                 break;
         }
 
-        if(spawnCreatureID)
+        if (spawnCreatureID)
             m_creature->SummonCreature(spawnCreatureID, 0.0f, 0.0f, 0.0f, m_creature->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
     }
 };
@@ -79,46 +79,46 @@ CreatureAI* GetAI_mob_webbed_creature(Creature *_Creature)
 
 #define C_SUNHAWK_TRIGGER 17974
 
-bool GossipHello_npc_captured_sunhawk_agent(Player *player, Creature *_Creature)
+bool GossipHello_npc_captured_sunhawk_agent(Player* pPlayer, Creature *_Creature)
 {
-    if (player->HasAura(31609) && player->GetQuestStatus(9756) == QUEST_STATUS_INCOMPLETE)
+    if (pPlayer->HasAura(31609) && pPlayer->GetQuestStatus(9756) == QUEST_STATUS_INCOMPLETE)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->SEND_GOSSIP_MENU(9136, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->SEND_GOSSIP_MENU(9136, _Creature->GetGUID());
     }
     else
-        player->SEND_GOSSIP_MENU(9134, _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(9134, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_captured_sunhawk_agent(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_captured_sunhawk_agent(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->SEND_GOSSIP_MENU(9137, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(9137, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-            player->SEND_GOSSIP_MENU(9138, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+            pPlayer->SEND_GOSSIP_MENU(9138, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
-            player->SEND_GOSSIP_MENU(9139, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+            pPlayer->SEND_GOSSIP_MENU(9139, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-            player->SEND_GOSSIP_MENU(9140, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            pPlayer->SEND_GOSSIP_MENU(9140, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
-            player->SEND_GOSSIP_MENU(9141, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
+            pPlayer->SEND_GOSSIP_MENU(9141, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+6:
-            player->CLOSE_GOSSIP_MENU();
-            player->TalkedToCreature(C_SUNHAWK_TRIGGER, _Creature->GetGUID());
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->TalkedToCreature(C_SUNHAWK_TRIGGER, _Creature->GetGUID());
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp b/src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp
index 10cf10c6c95..8f9dacf8e3b 100644
--- a/src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp
+++ b/src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp
@@ -34,19 +34,19 @@ EndContentData */
 
 #define GOSSIP_ITEM_TELEPORT    "Teleport me to Amber Ledge, please."
 
-bool GossipHello_npc_tiare(Player *player, Creature *_Creature)
+bool GossipHello_npc_tiare(Player* pPlayer, Creature *_Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_GOSSIP);
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_GOSSIP);
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_tiare(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_tiare(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_OPTION_GOSSIP)
     {
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,50135,true);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,50135,true);
     }
     return true;
 }
@@ -58,31 +58,31 @@ bool GossipSelect_npc_tiare(Player *player, Creature *_Creature, uint32 sender,
 #define GOSSIP_ITEM_FREE_FLIGHT "I'd like passage to the Transitus Shield."
 #define GOSSIP_ITEM_FLIGHT      "May I use a drake to fly elsewhere?"
 
-bool GossipHello_npc_surristrasz(Player *player, Creature *_Creature)
+bool GossipHello_npc_surristrasz(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu(_Creature->GetGUID());
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
     if (_Creature->isTaxi())
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FREE_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_GOSSIP);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_TAXIVENDOR);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FREE_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_GOSSIP);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_TAXIVENDOR);
     }
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_surristrasz(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_surristrasz(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_OPTION_GOSSIP)
     {
-        player->CLOSE_GOSSIP_MENU();
-        player->CastSpell(player,46064,true);               //TaxiPath 795 (amber to coldarra)
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->CastSpell(pPlayer,46064,true);               //TaxiPath 795 (amber to coldarra)
     }
     if (action == GOSSIP_OPTION_TAXIVENDOR)
     {
-        player->GetSession()->SendTaxiMenu(_Creature);
+        pPlayer->GetSession()->SendTaxiMenu(_Creature);
     }
     return true;
 }
@@ -209,14 +209,14 @@ struct TRINITY_DLL_DECL npc_khunok_the_behemothAI : public ScriptedAI
     {
         ScriptedAI::MoveInLineOfSight(who);
 
-        if(who->GetTypeId() != TYPEID_UNIT)
+        if (who->GetTypeId() != TYPEID_UNIT)
             return;
 
-        if(who->GetEntry() == 25861 && me->IsWithinDistInMap(who, 10.0f))
+        if (who->GetEntry() == 25861 && me->IsWithinDistInMap(who, 10.0f))
         {
-            if(Unit *owner = who->GetOwner())
+            if (Unit *owner = who->GetOwner())
             {
-                if(owner->GetTypeId() == TYPEID_PLAYER)
+                if (owner->GetTypeId() == TYPEID_PLAYER)
                 {
                     DoCast(owner, 46231, true);
                     CAST_CRE(who)->ForcedDespawn();
diff --git a/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp b/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp
index e81d1186d8d..e5c4f59886b 100644
--- a/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp
+++ b/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp
@@ -52,9 +52,9 @@ struct TRINITY_DLL_DECL npc_ragged_johnAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if( who->HasAura(16468) )
+        if (who->HasAura(16468))
         {
-            if( who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 15) && who->isInAccessiblePlaceFor(m_creature) )
+            if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 15) && who->isInAccessiblePlaceFor(m_creature))
             {
                 DoCast(who,16472);
                 CAST_PLR(who)->AreaExploredOrEventHappens(4866);
@@ -72,69 +72,69 @@ CreatureAI* GetAI_npc_ragged_john(Creature *_Creature)
     return new npc_ragged_johnAI (_Creature);
 }
 
-bool GossipHello_npc_ragged_john(Player *player, Creature *_Creature)
+bool GossipHello_npc_ragged_john(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(4224) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(4224) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(2713, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(2713, _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_ragged_john(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_ragged_john(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->SEND_GOSSIP_MENU(2714, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(2714, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(2715, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(2715, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(2716, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(2716, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->SEND_GOSSIP_MENU(2717, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(2717, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->SEND_GOSSIP_MENU(2718, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(2718, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->SEND_GOSSIP_MENU(2719, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->SEND_GOSSIP_MENU(2719, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+6:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->SEND_GOSSIP_MENU(2720, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(2720, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+7:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
-            player->SEND_GOSSIP_MENU(2721, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
+            pPlayer->SEND_GOSSIP_MENU(2721, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+8:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
-            player->SEND_GOSSIP_MENU(2722, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
+            pPlayer->SEND_GOSSIP_MENU(2722, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+9:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
-            player->SEND_GOSSIP_MENU(2723, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+            pPlayer->SEND_GOSSIP_MENU(2723, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+10:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->SEND_GOSSIP_MENU(2725, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->SEND_GOSSIP_MENU(2725, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+11:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(4224);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(4224);
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
index 43c855aa366..0ac0bbab8a9 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
@@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_epochAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
index c2780950a57..d59e00de389 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
@@ -63,10 +63,10 @@ struct TRINITY_DLL_DECL boss_mal_ganisAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(!yelled)
+        if (!yelled)
         {
             if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 30)
             {
@@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL boss_mal_ganisAI : public ScriptedAI
             }
         }
 
-        if(!yelled2)
+        if (!yelled2)
         {
             if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 15)
             {
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
index 64877e5ddca..dc39bd49cec 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
@@ -60,22 +60,22 @@ struct TRINITY_DLL_DECL boss_meathookAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(Disease_Timer < diff)
+        if (Disease_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_DISEASE_EXPULSION_N);
             Disease_Timer = 1500 + rand()%2500;
         }else Disease_Timer -= diff;
 
-        if(Frenzy_Timer < diff)
+        if (Frenzy_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_FRENZY);
             Frenzy_Timer = 20000 + rand()%10000;
         }else Frenzy_Timer -= diff;
 
-        if(Chain_Timer < diff)
+        if (Chain_Timer < diff)
         {
 
         /*
@@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL boss_meathookAI : public ScriptedAI
             Unit* targets[st];
             int st2=0;
             for(int i=1; i<=st; ++i){
-                if(!IsWithinLOSInMap(targets[i])
+                if (!IsWithinLOSInMap(targets[i])
                     st2++;
             }
             Unit* targets_out_of_LOS[st2];*/
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
index 8111a0a3aa7..e466f7ebe50 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
@@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         Unit* random_target = SelectUnit(SELECT_TARGET_RANDOM, 0);
@@ -77,7 +77,7 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI
         //Shadow bolt timer
         if (Shadow_bolt_Timer < diff)
         {
-            if(random_target)
+            if (random_target)
                 DoCast(random_target,SPELL_SHADOW_BOLT_N);
             Shadow_bolt_Timer = 8000 + rand()%4000;
         }else Shadow_bolt_Timer -= diff;
@@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI
                     DoScriptText(SAY_STEAL_FLESH_3, m_creature);
                     break;
             }
-            if(random_target)
+            if (random_target)
                 DoCast(random_target,SPELL_STEAL_FLESH);
             Steal_flesh_Timer = 10000;
         }else Steal_flesh_Timer -= diff;
@@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI
                     DoScriptText(SAY_SUMMON_GHOULS_2, m_creature);
                     break;
             }
-            if(random_target)
+            if (random_target)
                 DoCast(random_target,SPELL_SUMMON_GHOULS);
             Summon_ghouls_Timer = 10000;
         }else Summon_ghouls_Timer -= diff;
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
index e6922d072b3..35ee68ea991 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
@@ -3,12 +3,12 @@
 
 struct TRINITY_DLL_DECL instance_culling_of_stratholme : public ScriptedInstance
 {
-    instance_culling_of_stratholme(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_culling_of_stratholme(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 };
 
-InstanceData* GetInstanceData_instance_culling_of_stratholme(Map* map)
+InstanceData* GetInstanceData_instance_culling_of_stratholme(Map* pMap)
 {
-    return new instance_culling_of_stratholme(map);
+    return new instance_culling_of_stratholme(pMap);
 }
 
 void AddSC_instance_culling_of_stratholme()
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp
index 43bafb7cf5f..69b8282da1e 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp
@@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL boss_aeonusAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Sand Breath
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
index b167ac99685..47a3e754eb3 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
@@ -105,7 +105,7 @@ struct TRINITY_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Arcane Blast
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp
index 24e8b6a4d62..558bff3bac3 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp
@@ -354,34 +354,34 @@ CreatureAI* GetAI_npc_time_rift(Creature *_Creature)
 #define SPELL_CHRONO_BEACON     34975
 #define ITEM_CHRONO_BEACON      24289
 
-bool GossipHello_npc_saat(Player *player, Creature *_Creature)
+bool GossipHello_npc_saat(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu(_Creature->GetGUID());
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(ITEM_CHRONO_BEACON,1))
+    if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1))
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
-        player->SEND_GOSSIP_MENU(10000,_Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->SEND_GOSSIP_MENU(10000,_Creature->GetGUID());
         return true;
     }
-    else if (player->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !player->HasItemCount(ITEM_CHRONO_BEACON,1))
+    else if (pPlayer->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1))
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
-        player->SEND_GOSSIP_MENU(10001,_Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->SEND_GOSSIP_MENU(10001,_Creature->GetGUID());
         return true;
     }
 
-    player->SEND_GOSSIP_MENU(10002,_Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(10002,_Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_saat(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_saat(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->CLOSE_GOSSIP_MENU();
-        _Creature->CastSpell(player,SPELL_CHRONO_BEACON,false);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        _Creature->CastSpell(pPlayer,SPELL_CHRONO_BEACON,false);
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp
index b2e8bc9d095..0b6a0049ee3 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp
@@ -61,7 +61,7 @@ static Wave RiftWaves[]=
 
 struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance
 {
-    instance_dark_portal(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_dark_portal(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounter[ENCOUNTERS];
 
@@ -104,8 +104,8 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance
         {
             for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
             {
-                if (Player* player = itr->getSource())
-                    player->SendUpdateWorldState(id,state);
+                if (Player* pPlayer = itr->getSource())
+                    pPlayer->SendUpdateWorldState(id,state);
             }
         }else debug_log("TSCR: Instance Black Portal: UpdateBMWorldState, but PlayerList is empty!");
     }
@@ -125,12 +125,12 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance
         return false;
     }
 
-    void OnPlayerEnter(Player *player)
+    void OnPlayerEnter(Player* pPlayer)
     {
         if (GetData(TYPE_MEDIVH) == IN_PROGRESS)
             return;
 
-        player->SendUpdateWorldState(WORLD_STATE_BM,0);
+        pPlayer->SendUpdateWorldState(WORLD_STATE_BM,0);
     }
 
     void OnCreatureCreate(Creature *creature, bool add)
@@ -347,9 +347,9 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_dark_portal(Map* map)
+InstanceData* GetInstanceData_instance_dark_portal(Map* pMap)
 {
-    return new instance_dark_portal(map);
+    return new instance_dark_portal(pMap);
 }
 
 void AddSC_instance_dark_portal()
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp
index 5e757ab03ca..c6458fef706 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp
@@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI
         go = false;
         pos = 0;
         SpellEntry *TempSpell = GET_SPELL(SPELL_SLEEP);
-        if(TempSpell && TempSpell->EffectImplicitTargetA[0] != 1)
+        if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 1)
         {
             TempSpell->EffectImplicitTargetA[0] = 1;
             TempSpell->EffectImplicitTargetB[0] = 0;
@@ -66,13 +66,13 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI
         AuraTimer = 5000;
         InfernoTimer = 45000;
 
-        if(pInstance && IsEvent)
+        if (pInstance && IsEvent)
             pInstance->SetData(DATA_ANETHERONEVENT, NOT_STARTED);
     }
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance && IsEvent)
+        if (pInstance && IsEvent)
             pInstance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS);
         DoPlaySoundToSet(m_creature, SOUND_ONAGGRO);
         DoYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL);
@@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI
     void JustDied(Unit *victim)
     {
         hyjal_trashAI::JustDied(victim);
-        if(pInstance && IsEvent)
+        if (pInstance && IsEvent)
             pInstance->SetData(DATA_ANETHERONEVENT, DONE);
         DoPlaySoundToSet(m_creature, SOUND_ONDEATH);
         DoYell(SAY_ONDEATH, LANG_UNIVERSAL, NULL);
@@ -123,10 +123,10 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI
         {
             //Must update npc_escortAI
             npc_escortAI::UpdateAI(diff);
-            if(!go)
+            if (!go)
             {
                 go = true;
-                if(pInstance)
+                if (pInstance)
                 {
                     AddWaypoint(0, 4896.08,    -1576.35,    1333.65);
                     AddWaypoint(1, 4898.68,    -1615.02,    1329.48);
@@ -143,13 +143,13 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(SwarmTimer < diff)
+        if (SwarmTimer < diff)
         {
             Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,100,true);
-            if(target)
+            if (target)
                 DoCast(target,SPELL_CARRION_SWARM);
 
             SwarmTimer = 45000+rand()%15000;
@@ -166,12 +166,12 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI
             }
         }else SwarmTimer -= diff;
 
-        if(SleepTimer < diff)
+        if (SleepTimer < diff)
         {
             for(uint8 i=0;i<3; ++i)
             {
                 Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,100,true);
-                if(target)
+                if (target)
                     target->CastSpell(target,SPELL_SLEEP,true);
             }
             SleepTimer = 60000;
@@ -187,12 +187,12 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI
                     break;
             }
         }else SleepTimer -= diff;
-        if(AuraTimer < diff)
+        if (AuraTimer < diff)
         {
             DoCast(m_creature, SPELL_VAMPIRIC_AURA,true);
             AuraTimer = 10000+rand()%10000;
         }else AuraTimer -= diff;
-        if(InfernoTimer < diff)
+        if (InfernoTimer < diff)
         {
             DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,100,true), SPELL_INFERNO);
             InfernoTimer = 45000;
@@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL mob_towering_infernalAI : public ScriptedAI
     mob_towering_infernalAI(Creature *c) : ScriptedAI(c)
     {
         pInstance = c->GetInstanceData();
-        if(pInstance)
+        if (pInstance)
             AnetheronGUID = pInstance->GetData64(DATA_ANETHERON);
     }
 
@@ -265,12 +265,12 @@ struct TRINITY_DLL_DECL mob_towering_infernalAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(CheckTimer < diff)
+        if (CheckTimer < diff)
         {
-            if(AnetheronGUID)
+            if (AnetheronGUID)
             {
                 Creature* boss = Unit::GetCreature((*m_creature),AnetheronGUID);
-                if(!boss || (boss && boss->isDead()))
+                if (!boss || (boss && boss->isDead()))
                 {
                     m_creature->setDeathState(JUST_DIED);
                     m_creature->RemoveCorpse();
@@ -284,7 +284,7 @@ struct TRINITY_DLL_DECL mob_towering_infernalAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(ImmolationTimer < diff)
+        if (ImmolationTimer < diff)
         {
             DoCast(m_creature, SPELL_IMMOLATION);
             ImmolationTimer = 5000;
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp
index 25e0ed6b38d..4dd20a385bd 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp
@@ -313,7 +313,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI
 
         std::list<Unit*> targets;
         std::list<HostilReference*>::iterator itr = m_threatlist.begin();
-        for( ; itr != m_threatlist.end(); ++itr)
+        for(; itr != m_threatlist.end(); ++itr)
         {
             Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid());
             if (pUnit && pUnit->isAlive())
@@ -458,7 +458,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI
             }else DrainNordrassilTimer -= diff;
         }
 
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 10) && !BelowTenPercent && !Enraged)
@@ -468,7 +468,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI
         {
             if (EnrageTimer < diff)
             {
-                if((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) > 10)
+                if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) > 10)
                 {
                     m_creature->GetMotionMaster()->Clear(false);
                     m_creature->GetMotionMaster()->MoveIdle();
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp
index 606125bd8e4..3de3fbb568d 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp
@@ -35,7 +35,7 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI
         go = false;
         pos = 0;
         SpellEntry *TempSpell = GET_SPELL(SPELL_HOWL_OF_AZGALOR);
-        if(TempSpell)
+        if (TempSpell)
             TempSpell->EffectRadiusIndex[0] = 12;//100yards instead of 50000?!
     }
 
@@ -59,13 +59,13 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI
         EnrageTimer = 600000;
         enraged = false;
 
-        if(pInstance && IsEvent)
+        if (pInstance && IsEvent)
             pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED);
     }
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance && IsEvent)
+        if (pInstance && IsEvent)
             pInstance->SetData(DATA_AZGALOREVENT, IN_PROGRESS);
         DoPlaySoundToSet(m_creature, SOUND_ONAGGRO);
         DoYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL);
@@ -104,7 +104,7 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI
     void JustDied(Unit *victim)
     {
         hyjal_trashAI::JustDied(victim);
-        if(pInstance && IsEvent)
+        if (pInstance && IsEvent)
             pInstance->SetData(DATA_AZGALOREVENT, DONE);
         DoPlaySoundToSet(m_creature, SOUND_ONDEATH);
     }
@@ -115,10 +115,10 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI
         {
             //Must update npc_escortAI
             npc_escortAI::UpdateAI(diff);
-            if(!go)
+            if (!go)
             {
                 go = true;
-                if(pInstance)
+                if (pInstance)
                 {
                     AddWaypoint(0, 5492.91,    -2404.61,    1462.63);
                     AddWaypoint(1, 5531.76,    -2460.87,    1469.55);
@@ -135,34 +135,34 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(RainTimer < diff)
+        if (RainTimer < diff)
         {
             DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,30,true), SPELL_RAIN_OF_FIRE);
             RainTimer = 20000+rand()%15000;
         }else RainTimer -= diff;
 
-        if(DoomTimer < diff)
+        if (DoomTimer < diff)
         {
             DoCast(SelectTarget(SELECT_TARGET_RANDOM,1,100,true), SPELL_DOOM);//never on tank
             DoomTimer = 45000+rand()%5000;
         }else DoomTimer -= diff;
 
-        if(HowlTimer < diff)
+        if (HowlTimer < diff)
         {
             DoCast(m_creature, SPELL_HOWL_OF_AZGALOR);
             HowlTimer = 30000;
         }else HowlTimer -= diff;
 
-        if(CleaveTimer < diff)
+        if (CleaveTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_CLEAVE);
             CleaveTimer = 10000+rand()%5000;
         }else CleaveTimer -= diff;
 
-        if(EnrageTimer < diff && !enraged)
+        if (EnrageTimer < diff && !enraged)
         {
             m_creature->InterruptNonMeleeSpells(false);
             DoCast(m_creature, SPELL_BERSERK, true);
@@ -188,7 +188,7 @@ struct TRINITY_DLL_DECL mob_lesser_doomguardAI : public hyjal_trashAI
     mob_lesser_doomguardAI(Creature *c) : hyjal_trashAI(c)
     {
         pInstance = c->GetInstanceData();
-        if(pInstance)
+        if (pInstance)
             AzgalorGUID = pInstance->GetData64(DATA_AZGALOR);
     }
 
@@ -233,12 +233,12 @@ struct TRINITY_DLL_DECL mob_lesser_doomguardAI : public hyjal_trashAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(CheckTimer < diff)
+        if (CheckTimer < diff)
         {
-            if(AzgalorGUID)
+            if (AzgalorGUID)
             {
                 Creature* boss = Unit::GetCreature((*m_creature),AzgalorGUID);
-                if(!boss || (boss && boss->isDead()))
+                if (!boss || (boss && boss->isDead()))
                 {
                     m_creature->setDeathState(JUST_DIED);
                     m_creature->RemoveCorpse();
@@ -249,16 +249,16 @@ struct TRINITY_DLL_DECL mob_lesser_doomguardAI : public hyjal_trashAI
         }else CheckTimer -= diff;
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(WarstompTimer < diff)
+        if (WarstompTimer < diff)
         {
             DoCast(m_creature, SPELL_WARSTOMP);
             WarstompTimer = 10000+rand()%5000;
         }else WarstompTimer -= diff;
 
-        if(CrippleTimer < diff)
+        if (CrippleTimer < diff)
         {
             DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,100,true), SPELL_CRIPPLE);
             CrippleTimer = 25000+rand()%5000;
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp
index b26ec432224..20d04223a8e 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp
@@ -32,7 +32,7 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI
         go = false;
         pos = 0;
         SpellEntry *TempSpell = GET_SPELL(SPELL_MARK);
-        if(TempSpell && TempSpell->EffectImplicitTargetA[0] != 1)
+        if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 1)
         {
             TempSpell->EffectImplicitTargetA[0] = 1;
             TempSpell->EffectImplicitTargetB[0] = 0;
@@ -54,13 +54,13 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI
         MarkTimer = 45000;
         MarkTimerBase = 45000;
 
-        if(pInstance && IsEvent)
+        if (pInstance && IsEvent)
             pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED);
     }
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance && IsEvent)
+        if (pInstance && IsEvent)
             pInstance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS);
         DoPlaySoundToSet(m_creature, SOUND_ONAGGRO);
         DoYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL);
@@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI
     void JustDied(Unit *victim)
     {
         hyjal_trashAI::JustDied(victim);
-        if(pInstance && IsEvent)
+        if (pInstance && IsEvent)
             pInstance->SetData(DATA_KAZROGALEVENT, DONE);
         DoPlaySoundToSet(m_creature, SOUND_ONDEATH);
     }
@@ -110,10 +110,10 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI
         {
             //Must update npc_escortAI
             npc_escortAI::UpdateAI(diff);
-            if(!go)
+            if (!go)
             {
                 go = true;
-                if(pInstance)
+                if (pInstance)
                 {
                     AddWaypoint(0, 5492.91,    -2404.61,    1462.63);
                     AddWaypoint(1, 5531.76,    -2460.87,    1469.55);
@@ -130,24 +130,24 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(CleaveTimer < diff)
+        if (CleaveTimer < diff)
         {
             DoCast(m_creature, SPELL_CLEAVE);
             CleaveTimer = 6000+rand()%15000;
         }else CleaveTimer -= diff;
 
-        if(WarStompTimer < diff)
+        if (WarStompTimer < diff)
         {
             DoCast(m_creature, SPELL_WARSTOMP);
             WarStompTimer = 60000;
         }else WarStompTimer -= diff;
 
-        if(m_creature->HasAura(SPELL_MARK))
+        if (m_creature->HasAura(SPELL_MARK))
             m_creature->RemoveAurasDueToSpell(SPELL_MARK);
-        if(MarkTimer < diff)
+        if (MarkTimer < diff)
         {
             //cast dummy, useful for bos addons
             m_creature->CastCustomSpell(m_creature, SPELL_MARK, NULL, NULL, NULL, false, NULL, NULL, m_creature->GetGUID());
@@ -162,7 +162,7 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI
                 }
             }
             MarkTimerBase -= 5000;
-            if(MarkTimerBase < 5500)
+            if (MarkTimerBase < 5500)
                 MarkTimerBase = 5500;
             MarkTimer = MarkTimerBase;
             switch(rand()%3)
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp
index 9a9b8a2de2f..a503d1905c3 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp
@@ -54,13 +54,13 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI
         NovaTimer = 15000;
         IceboltTimer = 10000;
 
-        if(pInstance && IsEvent)
+        if (pInstance && IsEvent)
             pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED);
     }
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance && IsEvent)
+        if (pInstance && IsEvent)
             pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS);
         DoPlaySoundToSet(m_creature, SOUND_ONAGGRO);
         DoYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL);
@@ -95,7 +95,7 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI
     void JustDied(Unit *victim)
     {
         hyjal_trashAI::JustDied(victim);
-        if(pInstance && IsEvent)
+        if (pInstance && IsEvent)
             pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, DONE);
         DoPlaySoundToSet(m_creature, SOUND_ONDEATH);
         DoYell(SAY_ONDEATH, LANG_UNIVERSAL, NULL);
@@ -107,10 +107,10 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI
         {
             //Must update npc_escortAI
             npc_escortAI::UpdateAI(diff);
-            if(!go)
+            if (!go)
             {
                 go = true;
-                if(pInstance)
+                if (pInstance)
                 {
                     AddWaypoint(0, 4896.08,    -1576.35,    1333.65);
                     AddWaypoint(1, 4898.68,    -1615.02,    1329.48);
@@ -127,15 +127,15 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(FrostArmorTimer < diff)
+        if (FrostArmorTimer < diff)
         {
             DoCast(m_creature, SPELL_FROST_ARMOR);
             FrostArmorTimer = 40000+rand()%20000;
         }else FrostArmorTimer -= diff;
-        if(DecayTimer < diff)
+        if (DecayTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_DEATH_AND_DECAY);
             DecayTimer = 60000+rand()%20000;
@@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI
                     break;
             }
         }else DecayTimer -= diff;
-        if(NovaTimer < diff)
+        if (NovaTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_FROST_NOVA);
             NovaTimer = 30000+rand()%15000;
@@ -167,7 +167,7 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI
                     break;
             }
         }else NovaTimer -= diff;
-        if(IceboltTimer < diff)
+        if (IceboltTimer < diff)
         {
             DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,40,true), SPELL_ICEBOLT);
             IceboltTimer = 11000+rand()%20000;
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp
index 0586241a552..a61d1f98d85 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp
@@ -64,40 +64,40 @@ CreatureAI* GetAI_npc_jaina_proudmoore(Creature *_Creature)
     return ai;
 }
 
-bool GossipHello_npc_jaina_proudmoore(Player *player, Creature *_Creature)
+bool GossipHello_npc_jaina_proudmoore(Player* pPlayer, Creature *_Creature)
 {
     hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI());
-    if(ai->EventBegun)
+    if (ai->EventBegun)
         return false;
 
     uint32 RageEncounter = ai->GetInstanceData(DATA_RAGEWINTERCHILLEVENT);
     uint32 AnetheronEncounter = ai->GetInstanceData(DATA_ANETHERONEVENT);
-    if(RageEncounter == NOT_STARTED)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_ALLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    else if(RageEncounter == DONE && AnetheronEncounter == NOT_STARTED)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ANETHERON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-    else if(RageEncounter == DONE && AnetheronEncounter == DONE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN,    GOSSIP_ACTION_INFO_DEF + 3);
+    if (RageEncounter == NOT_STARTED)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_ALLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    else if (RageEncounter == DONE && AnetheronEncounter == NOT_STARTED)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ANETHERON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+    else if (RageEncounter == DONE && AnetheronEncounter == DONE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN,    GOSSIP_ACTION_INFO_DEF + 3);
 
-    if(player->isGameMaster())
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->isGameMaster())
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_jaina_proudmoore(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_jaina_proudmoore(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI());
     switch(action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:
-            ai->StartEvent(player);
+            ai->StartEvent(pPlayer);
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
             ai->FirstBossDead = true;
             ai->WaveCount = 9;
-            ai->StartEvent(player);
+            ai->StartEvent(pPlayer);
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
             ai->Retreat();
@@ -128,7 +128,7 @@ CreatureAI* GetAI_npc_thrall(Creature *_Creature)
     return ai;
 }
 
-bool GossipHello_npc_thrall(Player *player, Creature *_Creature)
+bool GossipHello_npc_thrall(Player* pPlayer, Creature *_Creature)
 {
     hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI());
     if (ai->EventBegun)
@@ -140,34 +140,34 @@ bool GossipHello_npc_thrall(Player *player, Creature *_Creature)
     {
         uint32 KazrogalEvent = ai->GetInstanceData(DATA_KAZROGALEVENT);
         uint32 AzgalorEvent  = ai->GetInstanceData(DATA_AZGALOREVENT);
-        if(KazrogalEvent == NOT_STARTED)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_HORDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-        else if(KazrogalEvent == DONE && AzgalorEvent == NOT_STARTED)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AZGALOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-        else if(AzgalorEvent == DONE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+        if (KazrogalEvent == NOT_STARTED)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_HORDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        else if (KazrogalEvent == DONE && AzgalorEvent == NOT_STARTED)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AZGALOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+        else if (AzgalorEvent == DONE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
     }
 
-    if(player->isGameMaster())
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->isGameMaster())
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_thrall(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_thrall(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI());
     ai->DeSpawnVeins();//despawn the alliance veins
     switch(action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:
-            ai->StartEvent(player);
+            ai->StartEvent(pPlayer);
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
             ai->FirstBossDead = true;
             ai->WaveCount = 9;
-            ai->StartEvent(player);
+            ai->StartEvent(pPlayer);
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
             ai->Retreat();
@@ -188,31 +188,31 @@ CreatureAI* GetAI_npc_tyrande_whisperwind(Creature *_Creature)
     return ai;
 }
 
-bool GossipHello_npc_tyrande_whisperwind(Player* player, Creature* _Creature)
+bool GossipHello_npc_tyrande_whisperwind(Player* pPlayer, Creature* _Creature)
 {
     hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI());
     uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT);
 
     // Only let them get item if Azgalor is dead.
-    if (AzgalorEvent == DONE && !player->HasItemCount(ITEM_TEAR_OF_GODDESS,1))
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
-    player->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
+    if (AzgalorEvent == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS,1))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_tyrande_whisperwind(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_tyrande_whisperwind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF)
     {
             ItemPosCountVec dest;
-            uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_TEAR_OF_GODDESS, 1);
+            uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_TEAR_OF_GODDESS, 1);
             if (msg == EQUIP_ERR_OK)
             {
-                 Item* item = player->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true);
-                 if(item && player)
-                     player->SendNewItem(item,1,true,false,true);
+                 Item* item = pPlayer->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true);
+                 if (item && pPlayer)
+                     pPlayer->SendNewItem(item,1,true,false,true);
             }
-            player->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
             hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI());
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp
index 31fd03334c9..528cfb64583 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp
@@ -391,9 +391,9 @@ void hyjalAI::Reset()
 
 
     //Reset Instance Data for trash count
-    if(pInstance)
+    if (pInstance)
     {
-        if((!pInstance->GetData(DATA_ALLIANCE_RETREAT) && m_creature->GetEntry() == JAINA) || (pInstance->GetData(DATA_ALLIANCE_RETREAT) && m_creature->GetEntry() == THRALL))
+        if ((!pInstance->GetData(DATA_ALLIANCE_RETREAT) && m_creature->GetEntry() == JAINA) || (pInstance->GetData(DATA_ALLIANCE_RETREAT) && m_creature->GetEntry() == THRALL))
         {
             //Reset World States
             UpdateWorldState(WORLD_STATE_WAVES, 0);
@@ -409,13 +409,13 @@ void hyjalAI::Reset()
 
 void hyjalAI::EnterEvadeMode()
 {
-    if(m_creature->GetEntry() != JAINA)
+    if (m_creature->GetEntry() != JAINA)
         m_creature->RemoveAllAuras();
     m_creature->DeleteThreatList();
     m_creature->CombatStop(true);
     m_creature->LoadCreaturesAddon();
 
-    if(m_creature->isAlive())
+    if (m_creature->isAlive())
         m_creature->GetMotionMaster()->MoveTargetedHome();
 
     m_creature->SetLootRecipient(NULL);
@@ -423,9 +423,9 @@ void hyjalAI::EnterEvadeMode()
 
 void hyjalAI::EnterCombat(Unit *who)
 {
-    if(IsDummy)return;
+    if (IsDummy)return;
     for(uint8 i = 0; i < 3; ++i)
-        if(Spell[i].Cooldown)
+        if (Spell[i].Cooldown)
             SpellTimer[i] = Spell[i].Cooldown;
 
     Talk(ATTACKED);
@@ -433,7 +433,7 @@ void hyjalAI::EnterCombat(Unit *who)
 
 void hyjalAI::MoveInLineOfSight(Unit *who)
 {
-    if(IsDummy)
+    if (IsDummy)
         return;
 
     npc_escortAI::MoveInLineOfSight(who);
@@ -453,28 +453,28 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
     {
             case 17906:    //GARGOYLE
 
-                if(!FirstBossDead && (WaveCount == 1 || WaveCount == 3))
+                if (!FirstBossDead && (WaveCount == 1 || WaveCount == 3))
                 {//summon at tower
                     pCreature = m_creature->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0]+irand(-20,20), SpawnPointSpecial[SPAWN_NEAR_TOWER][1]+irand(-20,20), SpawnPointSpecial[SPAWN_NEAR_TOWER][2]+irand(-10,10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000);
-                    if(pCreature)
+                    if (pCreature)
                         CAST_AI(hyjal_trashAI, pCreature->AI())->useFlyPath = true;
                 }else{//summon at gate
                     pCreature = m_creature->SummonCreature(entry, SpawnPointSpecial[SPAWN_GARG_GATE][0]+irand(-10,10), SpawnPointSpecial[SPAWN_GARG_GATE][1]+irand(-10,10), SpawnPointSpecial[SPAWN_GARG_GATE][2]+irand(-10,10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000);
                 }
                 break;
             case 17907:    //FROST_WYRM ,
-                if(FirstBossDead && WaveCount == 1)
+                if (FirstBossDead && WaveCount == 1)
                 {//summon at gate
                     pCreature = m_creature->SummonCreature(entry, SpawnPointSpecial[SPAWN_WYRM_GATE][0],SpawnPointSpecial[SPAWN_WYRM_GATE][1],SpawnPointSpecial[SPAWN_WYRM_GATE][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000);
                 }else{
                     pCreature = m_creature->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0], SpawnPointSpecial[SPAWN_NEAR_TOWER][1],SpawnPointSpecial[SPAWN_NEAR_TOWER][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000);
-                    if(pCreature)
+                    if (pCreature)
                         CAST_AI(hyjal_trashAI, pCreature->AI())->useFlyPath = true;
                 }
                 break;
             case 17908:    //GIANT_INFERNAL
                 InfernalCount++;
-                if(InfernalCount > 7)InfernalCount = 0;
+                if (InfernalCount > 7)InfernalCount = 0;
                 pCreature = m_creature->SummonCreature(entry, InfernalPos[InfernalCount][0], InfernalPos[InfernalCount][1], InfernalPos[InfernalCount][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000);
                 break;
             default:
@@ -483,7 +483,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
 
     }
 
-    if(pCreature)
+    if (pCreature)
     {
         // Increment Enemy Count to be used in World States and instance script
         ++EnemyCount;
@@ -508,15 +508,15 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
                 CAST_AI(hyjal_trashAI, pCreature->AI())->IsEvent = true;
                 break;
         }
-        if(pInstance)
+        if (pInstance)
         {
-            if(pInstance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE)
+            if (pInstance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE)
                 pCreature->SetDisableReputationGain(true);//no repu for solo farming
         }
         // Check if creature is a boss.
         if (pCreature->isWorldBoss())
         {
-            if(!FirstBossDead)  BossGUID[0] = pCreature->GetGUID();
+            if (!FirstBossDead)  BossGUID[0] = pCreature->GetGUID();
             else                BossGUID[1] = pCreature->GetGUID();
             CheckTimer = 5000;
         }
@@ -529,7 +529,7 @@ void hyjalAI::SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3])
     if (rand()%4 == 0)
         Talk(RALLY);
 
-    if(!pInstance)
+    if (!pInstance)
     {
         error_log(ERROR_INST_DATA);
         return;
@@ -539,21 +539,21 @@ void hyjalAI::SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3])
     EnemyCount = pInstance->GetData(DATA_TRASH);
     for(uint8 i = 0; i < 18; ++i)
     {
-        if(wave[Count].Mob[i])
+        if (wave[Count].Mob[i])
             SummonCreature(wave[Count].Mob[i], Base);
     }
 
-    if(!wave[Count].IsBoss)
+    if (!wave[Count].IsBoss)
     {
         uint32 stateValue = Count+1;
-        if(FirstBossDead)
+        if (FirstBossDead)
             stateValue -= 9;                                // Subtract 9 from it to give the proper wave number if we are greater than 8
         UpdateWorldState(WORLD_STATE_WAVES, stateValue);    // Set world state to our current wave number
         UpdateWorldState(WORLD_STATE_ENEMY, 1);             // Enable world state
 
         pInstance->SetData(DATA_TRASH, EnemyCount);         // Send data for instance script to update count
 
-        if(!Debug)
+        if (!Debug)
             NextWaveTimer = wave[Count].WaveTimer;
         else
         {
@@ -571,9 +571,9 @@ void hyjalAI::SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3])
     CheckTimer = 5000;
 }
 
-void hyjalAI::StartEvent(Player* player)
+void hyjalAI::StartEvent(Player* pPlayer)
 {
-    if(!player || IsDummy)
+    if (!pPlayer || IsDummy)
         return;
 
     Talk(BEGIN);
@@ -583,7 +583,7 @@ void hyjalAI::StartEvent(Player* player)
 
     NextWaveTimer = 15000;
     CheckTimer = 5000;
-    PlayerGUID = player->GetGUID();
+    PlayerGUID = pPlayer->GetGUID();
 
     m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
 
@@ -596,7 +596,7 @@ void hyjalAI::StartEvent(Player* player)
 
 uint32 hyjalAI::GetInstanceData(uint32 Event)
 {
-    if(pInstance)
+    if (pInstance)
         return pInstance->GetData(Event);
     else error_log(ERROR_INST_DATA);
 
@@ -608,29 +608,29 @@ void hyjalAI::Talk(uint32 id)
     std::list<uint8> index;
     for(uint8 i = 0; i < 9; ++i)
     {
-        if(Faction == 0)                                    // Alliance
+        if (Faction == 0)                                    // Alliance
         {
-            if(JainaQuotes[i].id == id)
+            if (JainaQuotes[i].id == id)
                 index.push_back(i);
         }
-        else if(Faction == 1)                               // Horde
+        else if (Faction == 1)                               // Horde
         {
-            if(ThrallQuotes[i].id == id)
+            if (ThrallQuotes[i].id == id)
                 index.push_back(i);
         }
     }
 
-    if(index.empty())
+    if (index.empty())
         return;                                             // No quotes found, no use to continue
 
     uint8 ind = *(index.begin()) + rand()%index.size();
 
     int32 YellId = 0;
-    if(Faction == 0)                                        // Alliance
+    if (Faction == 0)                                        // Alliance
     {
         YellId = JainaQuotes[ind].textid;
     }
-    else if(Faction == 1)                                   // Horde
+    else if (Faction == 1)                                   // Horde
     {
         YellId = ThrallQuotes[ind].textid;
     }
@@ -641,30 +641,30 @@ void hyjalAI::Talk(uint32 id)
 
 void hyjalAI::UpdateWorldState(uint32 id, uint32 state)
 {
-    Map * map = m_creature->GetMap();
+    Map* pMap = m_creature->GetMap();
 
-    if(!map->IsDungeon())
+    if (!pMap->IsDungeon())
         return;
 
-    Map::PlayerList const& players = map->GetPlayers();
+    Map::PlayerList const& players = pMap->GetPlayers();
 
     if (!players.isEmpty())
     {
             for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
             {
-                if (Player* player = itr->getSource())
-                    player->SendUpdateWorldState(id,state);
+                if (Player* pPlayer = itr->getSource())
+                    pPlayer->SendUpdateWorldState(id,state);
             }
     }else debug_log("TSCR: HyjalAI: UpdateWorldState, but PlayerList is empty");
 }
 
 void hyjalAI::Retreat()
 {
-    if(pInstance)
+    if (pInstance)
     {
         pInstance->SetData(TYPE_RETREAT,SPECIAL);
 
-        if(Faction == 0)
+        if (Faction == 0)
         {
             pInstance->SetData(DATA_ALLIANCE_RETREAT, 1);
             AddWaypoint(0,JainaWPs[0][0],JainaWPs[0][1],JainaWPs[0][2]);
@@ -672,11 +672,11 @@ void hyjalAI::Retreat()
             Start(false, false);
             SetDespawnAtEnd(false);//move to center of alliance base
         }
-        if(Faction == 1)
+        if (Faction == 1)
         {
             pInstance->SetData(DATA_HORDE_RETREAT, 1);
             Creature* JainaDummy = m_creature->SummonCreature(JAINA,JainaDummySpawn[0][0],JainaDummySpawn[0][1],JainaDummySpawn[0][2],JainaDummySpawn[0][3],TEMPSUMMON_TIMED_DESPAWN,60000);
-            if(JainaDummy)
+            if (JainaDummy)
             {
                 JainaDummy->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
                 CAST_AI(hyjalAI, JainaDummy->AI())->IsDummy = true;
@@ -694,14 +694,14 @@ void hyjalAI::Retreat()
 
 void hyjalAI::SpawnVeins()
 {
-    if(Faction == 0)
+    if (Faction == 0)
     {
         if (VeinsSpawned[0])//prevent any buggers
             return;
         for (uint8 i = 0; i<7; ++i)
         {
             GameObject* gem = m_creature->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0);
-            if(gem)
+            if (gem)
                 VeinGUID[i]=gem->GetGUID();
         }
         VeinsSpawned[0] = true;
@@ -711,7 +711,7 @@ void hyjalAI::SpawnVeins()
         for (uint8 i = 7; i<14; ++i)
         {
             GameObject* gem = m_creature->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0);
-            if(gem)
+            if (gem)
                 VeinGUID[i]=gem->GetGUID();
         }
         VeinsSpawned[1] = true;
@@ -720,13 +720,13 @@ void hyjalAI::SpawnVeins()
 
 void hyjalAI::DeSpawnVeins()
 {
-    if(!pInstance)return;
-    if(Faction == 1)
+    if (!pInstance)return;
+    if (Faction == 1)
     {
         Creature* pUnit=Unit::GetCreature((*m_creature),pInstance->GetData64(DATA_JAINAPROUDMOORE));
         if (!pUnit)return;
         hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI());
-        if(!ai)return;
+        if (!ai)return;
         for (uint8 i = 0; i<7; ++i)
         {
             if (GameObject* gem = pInstance->instance->GetGameObject(pInstance->GetData64(ai->VeinGUID[i])))
@@ -737,10 +737,10 @@ void hyjalAI::DeSpawnVeins()
         Creature* pUnit=Unit::GetCreature((*m_creature),pInstance->GetData64(DATA_THRALL));
         if (!pUnit)return;
         hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI());
-        if(!ai)return;
+        if (!ai)return;
         for (uint8 i = 7; i<14; ++i)
         {
-            if(GameObject* gem = pInstance->instance->GetGameObject(pInstance->GetData64(ai->VeinGUID[i])))
+            if (GameObject* gem = pInstance->instance->GetGameObject(pInstance->GetData64(ai->VeinGUID[i])))
                 gem->Delete();
         }
     }
@@ -748,22 +748,22 @@ void hyjalAI::DeSpawnVeins()
 
 void hyjalAI::UpdateAI(const uint32 diff)
 {
-    if(IsDummy)
+    if (IsDummy)
     {
-        if(MassTeleportTimer < diff && DoMassTeleport)
+        if (MassTeleportTimer < diff && DoMassTeleport)
         {
             m_creature->CastSpell(m_creature,SPELL_MASS_TELEPORT,false);
             DoMassTeleport = false;
         }else MassTeleportTimer -= diff;
         return;
     }
-    if(DoHide)
+    if (DoHide)
     {
         DoHide = false;
         switch(m_creature->GetEntry())
         {
             case JAINA:
-                if(pInstance->GetData(DATA_ALLIANCE_RETREAT))
+                if (pInstance->GetData(DATA_ALLIANCE_RETREAT))
                 {
                     m_creature->SetVisibility(VISIBILITY_OFF);
                     HideNearPos(m_creature->GetPositionX(), m_creature->GetPositionY());
@@ -775,7 +775,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
                 else m_creature->SetVisibility(VISIBILITY_ON);
                 break;
             case THRALL: //thrall
-                if(pInstance->GetData(DATA_HORDE_RETREAT))
+                if (pInstance->GetData(DATA_HORDE_RETREAT))
                 {
                     m_creature->SetVisibility(VISIBILITY_OFF);
                     HideNearPos(m_creature->GetPositionX(), m_creature->GetPositionY());
@@ -789,13 +789,13 @@ void hyjalAI::UpdateAI(const uint32 diff)
                 break;
         }
     }
-    if(DoRespawn)
+    if (DoRespawn)
     {
-        if(RespawnTimer < diff)
+        if (RespawnTimer < diff)
         {
             DoRespawn = false;
             RespawnNearPos(m_creature->GetPositionX(), m_creature->GetPositionY());
-            if(Faction == 0)
+            if (Faction == 0)
             {
                 RespawnNearPos(5037.76, -1889.71);
             }else if (Faction == 1)
@@ -810,11 +810,11 @@ void hyjalAI::UpdateAI(const uint32 diff)
         }
         return;
     }
-    if(Overrun)
+    if (Overrun)
         DoOverrun(Faction, diff);
-    if(bRetreat)
+    if (bRetreat)
     {
-        if(RetreatTimer < diff)
+        if (RetreatTimer < diff)
         {
             IsDummy = true;
             bRetreat = false;
@@ -834,43 +834,43 @@ void hyjalAI::UpdateAI(const uint32 diff)
         }else RetreatTimer -= diff;
     }
 
-    if(!EventBegun)
+    if (!EventBegun)
         return;
 
-    if(Summon)
+    if (Summon)
     {
-        if(pInstance && EnemyCount)
+        if (pInstance && EnemyCount)
         {
             EnemyCount = pInstance->GetData(DATA_TRASH);
-            if(!EnemyCount)
+            if (!EnemyCount)
                 NextWaveTimer = 5000;
         }
 
-        if(NextWaveTimer < diff)
+        if (NextWaveTimer < diff)
         {
-            if(Faction == 0)
+            if (Faction == 0)
                 SummonNextWave(AllianceWaves, WaveCount, AllianceBase);
-            else if(Faction == 1)
+            else if (Faction == 1)
                 SummonNextWave(HordeWaves, WaveCount, HordeBase);
             ++WaveCount;
         }else NextWaveTimer -= diff;
     }
 
-    if(CheckTimer < diff)
+    if (CheckTimer < diff)
     {
         for(uint8 i = 0; i < 2; ++i)
         {
-            if(BossGUID[i])
+            if (BossGUID[i])
             {
                 Unit* pUnit = Unit::GetUnit((*m_creature), BossGUID[i]);
-                if(pUnit && (!pUnit->isAlive()))
+                if (pUnit && (!pUnit->isAlive()))
                 {
-                    if(BossGUID[i] == BossGUID[0])
+                    if (BossGUID[i] == BossGUID[0])
                     {
                         Talk(INCOMING);
                         FirstBossDead = true;
                     }
-                    else if(BossGUID[i] == BossGUID[1])
+                    else if (BossGUID[i] == BossGUID[1])
                     {
                         Talk(SUCCESS);
                         SecondBossDead = true;
@@ -886,16 +886,16 @@ void hyjalAI::UpdateAI(const uint32 diff)
         CheckTimer = 5000;
     }else CheckTimer -= diff;
 
-    if(!UpdateVictim())
+    if (!UpdateVictim())
         return;
 
     for(uint8 i = 0; i < 3; ++i)
     {
-        if(Spell[i].SpellId)
+        if (Spell[i].SpellId)
         {
-            if(SpellTimer[i] < diff)
+            if (SpellTimer[i] < diff)
             {
-                if(m_creature->IsNonMeleeSpellCasted(false))
+                if (m_creature->IsNonMeleeSpellCasted(false))
                     m_creature->InterruptNonMeleeSpells(false);
 
                 Unit* target = NULL;
@@ -907,7 +907,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
                     case TARGETTYPE_VICTIM: target = m_creature->getVictim(); break;
                 }
 
-                if(target && target->isAlive())
+                if (target && target->isAlive())
                 {
                     DoCast(target, Spell[i].SpellId);
                     SpellTimer[i] = Spell[i].Cooldown;
@@ -920,22 +920,22 @@ void hyjalAI::UpdateAI(const uint32 diff)
 }
 void hyjalAI::JustDied(Unit* killer)
 {
-    if(IsDummy)return;
+    if (IsDummy)return;
     m_creature->Respawn();
     m_creature->SetVisibility(VISIBILITY_OFF);
     DoRespawn = true;
     RespawnTimer = 120000;
     Talk(DEATH);
     Summons.DespawnAll();//despawn all wave's summons
-    if(pInstance)
+    if (pInstance)
     {//reset encounter if boss is despawned (ex: thrall is killed, boss despawns, event stucks at inprogress)
-        if(pInstance->GetData(DATA_RAGEWINTERCHILLEVENT) == IN_PROGRESS)
+        if (pInstance->GetData(DATA_RAGEWINTERCHILLEVENT) == IN_PROGRESS)
             pInstance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED);
-        if(pInstance->GetData(DATA_ANETHERONEVENT) == IN_PROGRESS)
+        if (pInstance->GetData(DATA_ANETHERONEVENT) == IN_PROGRESS)
             pInstance->SetData(DATA_ANETHERONEVENT, NOT_STARTED);
-        if(pInstance->GetData(DATA_KAZROGALEVENT) == IN_PROGRESS)
+        if (pInstance->GetData(DATA_KAZROGALEVENT) == IN_PROGRESS)
             pInstance->SetData(DATA_KAZROGALEVENT, NOT_STARTED);
-        if(pInstance->GetData(DATA_AZGALOREVENT) == IN_PROGRESS)
+        if (pInstance->GetData(DATA_AZGALOREVENT) == IN_PROGRESS)
             pInstance->SetData(DATA_AZGALOREVENT, NOT_STARTED);
         pInstance->SetData(DATA_RESET_RAIDDAMAGE, NULL);//reset damage on die
     }
@@ -959,7 +959,7 @@ void hyjalAI::HideNearPos(float x, float y)
                                                             // Get Creatures
     cell_lock->Visit(cell_lock, creature_visitor, *(m_creature->GetMap()));
 
-    if(!creatures.empty())
+    if (!creatures.empty())
     {
         for(std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
         {
@@ -983,17 +983,17 @@ void hyjalAI::RespawnNearPos(float x, float y)
 }
 void hyjalAI::WaypointReached(uint32 i)
 {
-    if(i == 1 || (i == 0 && m_creature->GetEntry() == THRALL))
+    if (i == 1 || (i == 0 && m_creature->GetEntry() == THRALL))
     {
         m_creature->MonsterYell("Hurry, we don't have much time",0,0);
         WaitForTeleport = true;
         TeleportTimer = 20000;
-        if(m_creature->GetEntry() == JAINA)
+        if (m_creature->GetEntry() == JAINA)
             m_creature->CastSpell(m_creature,SPELL_MASS_TELEPORT,false);
-        if(m_creature->GetEntry() == THRALL && DummyGuid)
+        if (m_creature->GetEntry() == THRALL && DummyGuid)
         {
             Unit* Dummy = Unit::GetUnit((*m_creature),DummyGuid);
-            if(Dummy)
+            if (Dummy)
             {
                 CAST_AI(hyjalAI, CAST_CRE(Dummy)->AI())->DoMassTeleport = true;
                 CAST_AI(hyjalAI, CAST_CRE(Dummy)->AI())->MassTeleportTimer = 20000;
@@ -1018,19 +1018,19 @@ void hyjalAI::WaypointReached(uint32 i)
         CellLock<GridReadGuard> cell_lock(cell, pair);
         cell_lock->Visit(cell_lock, creature_visitor, *(m_creature->GetMap()));
 
-        if(!creatures.empty())
+        if (!creatures.empty())
         {
             for(std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
             {
-                if((*itr) && (*itr)->isAlive() && (*itr) != m_creature && (*itr)->GetEntry() != JAINA)
+                if ((*itr) && (*itr)->isAlive() && (*itr) != m_creature && (*itr)->GetEntry() != JAINA)
                 {
-                    if(!(*itr)->IsWithinDist(m_creature, 60))
+                    if (!(*itr)->IsWithinDist(m_creature, 60))
                         (*itr)->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
                     float x, y, z;
                     (*itr)->SetDefaultMovementType(IDLE_MOTION_TYPE);
                     (*itr)->GetMotionMaster()->Initialize();
                     float range = 10;
-                    if(m_creature->GetEntry() == THRALL)range = 20;
+                    if (m_creature->GetEntry() == THRALL)range = 20;
                     m_creature->GetNearPoint(m_creature, x, y, z, range, 0, m_creature->GetAngle((*itr)));
                     (*itr)->GetMotionMaster()->MovePoint(0, x+irand(-5,5), y+irand(-5,5), m_creature->GetPositionZ());
                 }
@@ -1041,9 +1041,9 @@ void hyjalAI::WaypointReached(uint32 i)
 void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
 {
     npc_escortAI::UpdateAI(diff);
-    if(WaitForTeleport)
+    if (WaitForTeleport)
     {
-        if(TeleportTimer < diff)
+        if (TeleportTimer < diff)
         {
             CellPair pair(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY()));
             Cell cell(pair);
@@ -1060,11 +1060,11 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
             CellLock<GridReadGuard> cell_lock(cell, pair);
             cell_lock->Visit(cell_lock, creature_visitor, *(m_creature->GetMap()));
 
-            if(!creatures.empty())
+            if (!creatures.empty())
             {
                 for(std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
                 {
-                    if((*itr) && (*itr)->isAlive())
+                    if ((*itr) && (*itr)->isAlive())
                     {
                         (*itr)->CastSpell(*itr, SPELL_TELEPORT_VISUAL, true);
                         (*itr)->setFaction(35);//make them friendly so mobs won't attack them
@@ -1080,7 +1080,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
             Teleported = true;
         }TeleportTimer -= diff;
     }
-    if(!Teleported)
+    if (!Teleported)
         return;
     Overrun = false;//execute once
     switch(faction)
@@ -1093,7 +1093,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
             {
                 uint8 r = rand()%4;
                 Creature* pUnit = m_creature->SummonCreature(GHOUL, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
-                if(pUnit)
+                if (pUnit)
                 {
                     CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction;
                     CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true;
@@ -1105,7 +1105,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
             {
                 uint8 r = rand()%4;
                 Creature* pUnit = m_creature->SummonCreature(ABOMINATION, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
-                if(pUnit)
+                if (pUnit)
                 {
                     CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction;
                     CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true;
@@ -1116,7 +1116,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
             for(uint8 i = 0; i < 5; ++i)//summon 5 gargoyles
             {
                 Creature* pUnit = m_creature->SummonCreature(GARGOYLE, AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
-                if(pUnit)
+                if (pUnit)
                 {
                     pUnit->SetHomePosition(AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3]);
                     CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction;
@@ -1133,7 +1133,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
             for(uint8 i = 0; i < 26; ++i)//summon infernals
             {
                 Creature* pUnit = m_creature->SummonCreature(GIANT_INFERNAL, InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
-                if(pUnit)
+                if (pUnit)
                 {
                     pUnit->SetHomePosition(InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3]);
                     CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction;
@@ -1146,7 +1146,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
             {
                 uint8 r = rand()%4;
                 Creature* pUnit = m_creature->SummonCreature(GHOUL, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
-                if(pUnit)
+                if (pUnit)
                 {
                     CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction;
                     CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true;
@@ -1158,7 +1158,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
             {
                 uint8 r = rand()%4;
                 Creature* pUnit = m_creature->SummonCreature(ABOMINATION, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
-                if(pUnit)
+                if (pUnit)
                 {
                     CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction;
                     CAST_AI(hyjal_trashAI, pUnit->AI())->IsOverrun = true;
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp
index 3d388da99d5..7221fc36cde 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp
@@ -156,40 +156,40 @@ hyjal_trashAI::hyjal_trashAI(Creature *c) : npc_escortAI(c)
 
 void hyjal_trashAI::DamageTaken(Unit *done_by, uint32 &damage)
 {
-    if(done_by->GetTypeId() == TYPEID_PLAYER || (done_by->GetTypeId() == TYPEID_UNIT && CAST_CRE(done_by)->isPet()))
+    if (done_by->GetTypeId() == TYPEID_PLAYER || (done_by->GetTypeId() == TYPEID_UNIT && CAST_CRE(done_by)->isPet()))
     {
         damageTaken += damage;
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_RAIDDAMAGE,damage);//store raid's damage
     }
 }
 
 void hyjal_trashAI::UpdateAI(const uint32 diff)
 {
-    if(IsOverrun && !SetupOverrun)
+    if (IsOverrun && !SetupOverrun)
     {
         SetupOverrun = true;
-        if(faction == 0)
+        if (faction == 0)
         {
-            if(m_creature->GetEntry() == GARGOYLE)
+            if (m_creature->GetEntry() == GARGOYLE)
             {
                 DummyTarget[0] = AllianceOverrunWP[50+OverrunType][0]; //+OverrunType 0 - 4
                 DummyTarget[1] = AllianceOverrunWP[50+OverrunType][1];
                 DummyTarget[2] = AllianceOverrunWP[50+OverrunType][2];
             }
-            if(m_creature->GetEntry() == ABOMINATION)
+            if (m_creature->GetEntry() == ABOMINATION)
             {
                 for(uint8 i = 0; i < 4; ++i)
                     AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]);
                 switch(OverrunType)
                 {
                     case 0:
-                        AddWaypoint( 4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]);
-                        AddWaypoint( 5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]);
-                        AddWaypoint( 6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]);
-                        AddWaypoint( 7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]);
-                        AddWaypoint( 8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]);
-                        AddWaypoint( 9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]);
+                        AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]);
+                        AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]);
+                        AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]);
+                        AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]);
+                        AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]);
+                        AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]);
                         AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3,3), AllianceOverrunWP[28][1]+irand(-3,3), AllianceOverrunWP[28][2]);
 
                         AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3,3), AllianceOverrunWP[36][1]+irand(-3,3), AllianceOverrunWP[36][2]);
@@ -206,12 +206,12 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
                         Start(true, true);
                         break;
                      case 1:
-                        AddWaypoint( 4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]);
-                        AddWaypoint( 5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]);
-                        AddWaypoint( 6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]);
-                        AddWaypoint( 7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]);
-                        AddWaypoint( 8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]);
-                        AddWaypoint( 9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]);
+                        AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]);
+                        AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]);
+                        AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]);
+                        AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]);
+                        AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]);
+                        AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]);
                         AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3,3), AllianceOverrunWP[28][1]+irand(-3,3), AllianceOverrunWP[28][2]);
 
                         AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3,3), AllianceOverrunWP[36][1]+irand(-3,3), AllianceOverrunWP[36][2]);
@@ -229,7 +229,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
                         break;
                     default:
                         for(uint8 i = 22; i < 36; ++i)
-                            AddWaypoint( i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]);
+                            AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]);
 
                         SetDespawnAtEnd(true);
                         LastOverronPos = 17;
@@ -237,7 +237,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
                         break;
                 }
             }
-            if(m_creature->GetEntry() == GHOUL)
+            if (m_creature->GetEntry() == GHOUL)
             {
                 for(uint8 i = 0; i < 4; ++i)
                     AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]);
@@ -302,7 +302,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
                         break;
                     default:
                         for(uint8 i = 22; i < 36; ++i)
-                            AddWaypoint( i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]);
+                            AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]);
                         SetDespawnAtEnd(true);
                         LastOverronPos = 17;
                         Start(true, true);
@@ -310,29 +310,29 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
                 }
             }
         }
-        if(faction == 1)
+        if (faction == 1)
         {
-            if(m_creature->GetEntry() == GHOUL)
+            if (m_creature->GetEntry() == GHOUL)
             {
                 for(uint8 i = 0; i < 6; ++i)
                     AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]);
                 switch(OverrunType)
                 {
                     case 0:
-                        AddWaypoint( 5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]);
-                        AddWaypoint( 6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]);
-                        AddWaypoint( 7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]);
-                        AddWaypoint( 8, HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2]);
+                        AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]);
+                        AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]);
+                        AddWaypoint(7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]);
+                        AddWaypoint(8, HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2]);
                         m_creature->SetHomePosition(HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2],0);
                         SetDespawnAtEnd(false);
                         LastOverronPos = 8;
                         Start(true, true);
                         break;
                     case 1:
-                        AddWaypoint( 5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]);
-                        AddWaypoint( 6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]);
-                        AddWaypoint( 7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]);
-                        AddWaypoint( 8, HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2]);
+                        AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]);
+                        AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]);
+                        AddWaypoint(7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]);
+                        AddWaypoint(8, HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2]);
                         m_creature->SetHomePosition(HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2],0);
                         SetDespawnAtEnd(false);
                         LastOverronPos = 8;
@@ -340,19 +340,19 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
                         break;
                     default:
                         for(uint8 i = 0; i < 16; ++i)
-                            AddWaypoint( i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]);
+                            AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]);
                         SetDespawnAtEnd(true);
                         LastOverronPos = 21;
                         Start(true, true);
                         break;
                 }
             }
-            if(m_creature->GetEntry() == ABOMINATION)
+            if (m_creature->GetEntry() == ABOMINATION)
             {
                 for(uint8 i = 0; i < 6; ++i)
                     AddWaypoint(i, HordeWPs[i][0]+irand(-10,10), HordeWPs[i][1]+irand(-10,10), HordeWPs[i][2]);
                 for(uint8 i = 0; i < 16; ++i)
-                    AddWaypoint( i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]);
+                    AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]);
                 SetDespawnAtEnd(true);
                 LastOverronPos = 21;
                 Start(true, true);
@@ -363,11 +363,11 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
 
 void hyjal_trashAI::JustDied(Unit *victim)
 {
-    if(!pInstance)return;
-    if(IsEvent && !m_creature->isWorldBoss())
+    if (!pInstance)return;
+    if (IsEvent && !m_creature->isWorldBoss())
         pInstance->SetData(DATA_TRASH, 0);//signal trash is dead
 
-    if((pInstance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE && !m_creature->isWorldBoss()) || (damageTaken < m_creature->GetMaxHealth()/4 && m_creature->isWorldBoss()))
+    if ((pInstance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE && !m_creature->isWorldBoss()) || (damageTaken < m_creature->GetMaxHealth()/4 && m_creature->isWorldBoss()))
         m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);//no loot
 }
 
@@ -421,7 +421,7 @@ struct mob_giant_infernalAI : public hyjal_trashAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(Delay<diff)
+        if (Delay<diff)
         {
             Delay=0;
         }else{
@@ -433,7 +433,7 @@ struct mob_giant_infernalAI : public hyjal_trashAI
             float x,y,z;
             m_creature->GetPosition(x,y,z);
             Creature* trigger = m_creature->SummonCreature(NPC_TRIGGER,x+8,y+8,z+25+rand()%10,m_creature->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,1000);
-            if(trigger)
+            if (trigger)
             {
                 trigger->SetVisibility(VISIBILITY_OFF);
                 trigger->setFaction(m_creature->getFaction());
@@ -443,7 +443,7 @@ struct mob_giant_infernalAI : public hyjal_trashAI
             m_creature->GetMotionMaster()->Clear();
             meteor = true;
         }else if (!CanMove){
-            if(spawnTimer<diff)
+            if (spawnTimer<diff)
             {
                 m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -462,16 +462,16 @@ struct mob_giant_infernalAI : public hyjal_trashAI
                 }
             }else spawnTimer -= diff;
         }
-        if(!CanMove)return;
+        if (!CanMove)return;
         hyjal_trashAI::UpdateAI(diff);
-        if(IsEvent || IsOverrun)
+        if (IsEvent || IsOverrun)
             npc_escortAI::UpdateAI(diff);
         if (IsEvent)
         {
-            if(!go)
+            if (!go)
             {
                 go = true;
-                if(pInstance)
+                if (pInstance)
                 {
                     AddWaypoint(0, HordeWPs[7][0]+irand(-3,3),    HordeWPs[7][1]+irand(-3,3),    HordeWPs[7][2]);//HordeWPs[7] infront of thrall
                     Start(true, true);
@@ -482,12 +482,12 @@ struct mob_giant_infernalAI : public hyjal_trashAI
 
         if (!UpdateVictim())
             return;
-        if(!imol)
+        if (!imol)
         {
             DoCast(m_creature,SPELL_IMMOLATION);
             imol=true;
         }
-        if(FlameBuffetTimer<diff)
+        if (FlameBuffetTimer<diff)
         {
             DoCast(m_creature->getVictim(),SPELL_FLAME_BUFFET,true);
             FlameBuffetTimer = 7000;
@@ -541,7 +541,7 @@ struct mob_abominationAI : public hyjal_trashAI
         }
         if (i == LastOverronPos && IsOverrun)
         {
-            if((faction == 0 && LastOverronPos == 17) || (faction == 1 && LastOverronPos == 21))
+            if ((faction == 0 && LastOverronPos == 17) || (faction == 1 && LastOverronPos == 21))
             {
                 m_creature->setDeathState(DEAD);
                 m_creature->RemoveCorpse();
@@ -554,14 +554,14 @@ struct mob_abominationAI : public hyjal_trashAI
     void UpdateAI(const uint32 diff)
     {
         hyjal_trashAI::UpdateAI(diff);
-        if(IsEvent || IsOverrun)
+        if (IsEvent || IsOverrun)
             npc_escortAI::UpdateAI(diff);
         if (IsEvent)
         {
-            if(!go)
+            if (!go)
             {
                 go = true;
-                if(pInstance)
+                if (pInstance)
                 {
                     if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
                     {
@@ -579,11 +579,11 @@ struct mob_abominationAI : public hyjal_trashAI
                 }
             }
         }
-        if(!m_creature->HasAura(SPELL_DISEASE_CLOUD))
+        if (!m_creature->HasAura(SPELL_DISEASE_CLOUD))
             DoCast(m_creature,SPELL_DISEASE_CLOUD);
         if (!UpdateVictim())
             return;
-        if(KnockDownTimer<diff)
+        if (KnockDownTimer<diff)
         {
             DoCast(m_creature->getVictim(),SPELL_KNOCKDOWN);
             KnockDownTimer = 15000+rand()%10000;
@@ -641,7 +641,7 @@ struct mob_ghoulAI : public hyjal_trashAI
         if (i == LastOverronPos && IsOverrun)
         {
             m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_ATTACKUNARMED);
-            if((faction == 0 && LastOverronPos == 17) || (faction == 1 && LastOverronPos == 21))
+            if ((faction == 0 && LastOverronPos == 17) || (faction == 1 && LastOverronPos == 21))
             {
                 m_creature->setDeathState(DEAD);
                 m_creature->RemoveCorpse();
@@ -655,14 +655,14 @@ struct mob_ghoulAI : public hyjal_trashAI
     void UpdateAI(const uint32 diff)
     {
         hyjal_trashAI::UpdateAI(diff);
-        if(IsEvent || IsOverrun)
+        if (IsEvent || IsOverrun)
             npc_escortAI::UpdateAI(diff);
         if (IsEvent)
         {
-            if(!go)
+            if (!go)
             {
                 go = true;
-                if(pInstance)
+                if (pInstance)
                 {
                     if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
                     {
@@ -680,7 +680,7 @@ struct mob_ghoulAI : public hyjal_trashAI
                 }
             }
         }
-        if(FrenzyTimer<diff)
+        if (FrenzyTimer<diff)
         {
             DoCast(m_creature,SPELL_FRENZY);
             FrenzyTimer = 15000+rand()%15000;
@@ -725,7 +725,7 @@ struct mob_necromancerAI : public hyjal_trashAI
     void JustSummoned(Creature* summon)
     {
         Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,30,true);
-        if(target && summon)
+        if (target && summon)
             summon->Attack(target,false);
         summons.Summon(summon);
     }
@@ -761,7 +761,7 @@ struct mob_necromancerAI : public hyjal_trashAI
                 DoSpawnCreature(17903,-3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000);
                 break;
             case 2:
-                if(rand()%2)
+                if (rand()%2)
                     DoSpawnCreature(17902,3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000);
                 else
                     DoSpawnCreature(17903,3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000);
@@ -774,14 +774,14 @@ struct mob_necromancerAI : public hyjal_trashAI
     void UpdateAI(const uint32 diff)
     {
         hyjal_trashAI::UpdateAI(diff);
-        if(IsEvent || IsOverrun)
+        if (IsEvent || IsOverrun)
             npc_escortAI::UpdateAI(diff);
         if (IsEvent)
         {
-            if(!go)
+            if (!go)
             {
                 go = true;
-                if(pInstance)
+                if (pInstance)
                 {
                     if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
                     {
@@ -801,7 +801,7 @@ struct mob_necromancerAI : public hyjal_trashAI
         }
         if (!UpdateVictim())
             return;
-        if(ShadowBoltTimer<diff)
+        if (ShadowBoltTimer<diff)
         {
             DoCast(m_creature->getVictim(),SPELL_SHADOW_BOLT);
             ShadowBoltTimer = 20000+rand()%10000;
@@ -866,14 +866,14 @@ struct mob_bansheeAI : public hyjal_trashAI
     void UpdateAI(const uint32 diff)
     {
         hyjal_trashAI::UpdateAI(diff);
-        if(IsEvent || IsOverrun)
+        if (IsEvent || IsOverrun)
             npc_escortAI::UpdateAI(diff);
         if (IsEvent)
         {
-            if(!go)
+            if (!go)
             {
                 go = true;
-                if(pInstance)
+                if (pInstance)
                 {
                     if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
                     {
@@ -893,17 +893,17 @@ struct mob_bansheeAI : public hyjal_trashAI
         }
         if (!UpdateVictim())
             return;
-        if(CourseTimer<diff)
+        if (CourseTimer<diff)
         {
             DoCast(m_creature->getVictim(),SPELL_BANSHEE_CURSE);
             CourseTimer = 20000+rand()%5000;
         }else CourseTimer -= diff;
-        if(WailTimer<diff)
+        if (WailTimer<diff)
         {
             DoCast(m_creature->getVictim(),SPELL_BANSHEE_WAIL);
             WailTimer = 15000+rand()%5000;
         }else WailTimer -= diff;
-        if(ShellTimer<diff)
+        if (ShellTimer<diff)
         {
             DoCast(m_creature,SPELL_ANTI_MAGIC_SHELL);
             ShellTimer = 50000+rand()%10000;
@@ -961,14 +961,14 @@ struct mob_crypt_fiendAI : public hyjal_trashAI
     void UpdateAI(const uint32 diff)
     {
         hyjal_trashAI::UpdateAI(diff);
-        if(IsEvent || IsOverrun)
+        if (IsEvent || IsOverrun)
             npc_escortAI::UpdateAI(diff);
         if (IsEvent)
         {
-            if(!go)
+            if (!go)
             {
                 go = true;
-                if(pInstance)
+                if (pInstance)
                 {
                     if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
                     {
@@ -989,7 +989,7 @@ struct mob_crypt_fiendAI : public hyjal_trashAI
         }
         if (!UpdateVictim())
             return;
-        if(WebTimer<diff)
+        if (WebTimer<diff)
         {
             DoCast(m_creature->getVictim(),SPELL_WEB);
             WebTimer = 20000+rand()%5000;
@@ -1047,14 +1047,14 @@ struct mob_fel_stalkerAI : public hyjal_trashAI
     void UpdateAI(const uint32 diff)
     {
         hyjal_trashAI::UpdateAI(diff);
-        if(IsEvent || IsOverrun)
+        if (IsEvent || IsOverrun)
             npc_escortAI::UpdateAI(diff);
         if (IsEvent)
         {
-            if(!go)
+            if (!go)
             {
                 go = true;
-                if(pInstance)
+                if (pInstance)
                 {
                     if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs
                     {
@@ -1075,7 +1075,7 @@ struct mob_fel_stalkerAI : public hyjal_trashAI
         }
         if (!UpdateVictim())
             return;
-        if(ManaBurnTimer<diff)
+        if (ManaBurnTimer<diff)
         {
             DoCast(m_creature->getVictim(),SPELL_MANA_BURN);
             ManaBurnTimer = 9000+rand()%5000;
@@ -1130,7 +1130,7 @@ struct mob_frost_wyrmAI : public hyjal_trashAI
 
     void JustDied(Unit *victim)
     {
-        if(pInstance && IsEvent)
+        if (pInstance && IsEvent)
             pInstance->SetData(DATA_TRASH, 0);//signal trash is dead
 
         float x,y,z;
@@ -1145,19 +1145,19 @@ struct mob_frost_wyrmAI : public hyjal_trashAI
     void UpdateAI(const uint32 diff)
     {
         hyjal_trashAI::UpdateAI(diff);
-        if(IsEvent || IsOverrun)
+        if (IsEvent || IsOverrun)
         {
             CAST_AI(hyjal_trashAI, m_creature->AI())->SetCanMelee(false);
             npc_escortAI::UpdateAI(diff);
         }
         if (IsEvent)
         {
-            if(!go)
+            if (!go)
             {
                 go = true;
-                if(pInstance)
+                if (pInstance)
                 {
-                    if(!useFlyPath)
+                    if (!useFlyPath)
                     {
                         for (uint8 i = 0; i < 3; ++i)
                             AddWaypoint(i, FrostWyrmWPs[i][0],    FrostWyrmWPs[i][1],    FrostWyrmWPs[i][2]);
@@ -1174,17 +1174,17 @@ struct mob_frost_wyrmAI : public hyjal_trashAI
         }
         if (!UpdateVictim())
             return;
-        if(!m_creature->IsWithinDist(m_creature->getVictim(), 25)){
-            if(MoveTimer<diff)
+        if (!m_creature->IsWithinDist(m_creature->getVictim(), 25)){
+            if (MoveTimer<diff)
             {
                 m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
                 MoveTimer = 2000;
             }else MoveTimer-=diff;
         }
 
-        if(FrostBreathTimer<diff)
+        if (FrostBreathTimer<diff)
         {
-            if(!m_creature->IsWithinDist(m_creature->getVictim(), 25))
+            if (!m_creature->IsWithinDist(m_creature->getVictim(), 25))
             {
                 DoCast(m_creature->getVictim(),SPELL_FROST_BREATH);
                 m_creature->StopMoving();
@@ -1257,19 +1257,19 @@ struct mob_gargoyleAI : public hyjal_trashAI
     void UpdateAI(const uint32 diff)
     {
         hyjal_trashAI::UpdateAI(diff);
-        if(IsEvent || IsOverrun)
+        if (IsEvent || IsOverrun)
         {
             CAST_AI(hyjal_trashAI, m_creature->AI())->SetCanMelee(false);
             npc_escortAI::UpdateAI(diff);
         }
         if (IsEvent)
         {
-            if(!go)
+            if (!go)
             {
                 go = true;
-                if(pInstance)
+                if (pInstance)
                 {
-                    if(!useFlyPath)
+                    if (!useFlyPath)
                     {
                         for (uint8 i = 0; i < 3; ++i)
                             AddWaypoint(i, GargoyleWPs[i][0]+irand(-10,10), GargoyleWPs[i][1]+irand(-10,10), GargoyleWPs[i][2]);
@@ -1284,11 +1284,11 @@ struct mob_gargoyleAI : public hyjal_trashAI
                 }
             }
         }
-        if(IsOverrun && !UpdateVictim())
+        if (IsOverrun && !UpdateVictim())
         {
-            if(faction == 0)//alliance
+            if (faction == 0)//alliance
             {
-                if(StrikeTimer<diff)
+                if (StrikeTimer<diff)
                 {
                     m_creature->CastSpell(DummyTarget[0],DummyTarget[1],DummyTarget[2],SPELL_GARGOYLE_STRIKE,false);
                     StrikeTimer = 2000+rand()%1000;
@@ -1297,28 +1297,28 @@ struct mob_gargoyleAI : public hyjal_trashAI
         }
         if (!UpdateVictim())
             return;
-        if(!m_creature->IsWithinDist(m_creature->getVictim(), 20) || forcemove)
+        if (!m_creature->IsWithinDist(m_creature->getVictim(), 20) || forcemove)
         {
             forcemove = false;
-            if(forcemove)
+            if (forcemove)
             {
                 Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                if(target)
+                if (target)
                     m_creature->Attack(target,false);
             }
-            if(MoveTimer<diff)
+            if (MoveTimer<diff)
             {
                 float x,y,z;
                 m_creature->getVictim()->GetPosition(x,y,z);
                 m_creature->GetMotionMaster()->MovePoint(0,x,y,z+Zpos);
                 Zpos-=1.0;
-                if(Zpos<=0)Zpos=0;
+                if (Zpos<=0)Zpos=0;
                 MoveTimer = 2000;
             }else MoveTimer-=diff;
         }
-        if(StrikeTimer<diff)
+        if (StrikeTimer<diff)
         {
-            if(m_creature->IsWithinDist(m_creature->getVictim(), 20))
+            if (m_creature->IsWithinDist(m_creature->getVictim(), 20))
             {
                 DoCast(m_creature->getVictim(),SPELL_GARGOYLE_STRIKE);
                 m_creature->StopMoving();
@@ -1379,7 +1379,7 @@ struct TRINITY_DLL_DECL alliance_riflemanAI : public Scripted_NoMovementAI
         //Check if we have a target
         if (!UpdateVictim())
             return;
-        if(ExplodeTimer < diff)
+        if (ExplodeTimer < diff)
         {
             if (!m_creature->IsWithinDistInMap(m_creature->getVictim(), 30))
             {
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp
index 7541bd124aa..e8aeb1f1dfb 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp
@@ -41,7 +41,7 @@ enum
 
 struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
 {
-    instance_mount_hyjal(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_mount_hyjal(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounters[ENCOUNTERS];
     std::string str_data;
@@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS) return true;
+            if (Encounters[i] == IN_PROGRESS) return true;
 
         return false;
     }
@@ -107,14 +107,14 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
         {
             case 182060:
                 HordeGate = go->GetGUID();
-                if(allianceRetreat)
+                if (allianceRetreat)
                     HandleGameObject(0, true, go);
                 else
                     HandleGameObject(0, false, go);
                 break;
             case 182061:
                 ElfGate = go->GetGUID();
-                if(hordeRetreat)
+                if (hordeRetreat)
                     HandleGameObject(0, true, go);
                 else
                     HandleGameObject(0, false, go);
@@ -169,21 +169,21 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
             case DATA_AZGALOREVENT:
                 {
                     Encounters[3] = data;
-                    if(data==DONE)
+                    if (data==DONE)
                     {
-                        if(ArchiYell)break;
+                        if (ArchiYell)break;
                         ArchiYell = true;
 
                         Creature* pCreature = instance->GetCreature(Azgalor);
-                        if(pCreature)
+                        if (pCreature)
                         {
                             Creature* pUnit = pCreature->SummonCreature(21987,pCreature->GetPositionX(),pCreature->GetPositionY(),pCreature->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,10000);
 
-                            Map *map = pCreature->GetMap();
-                            if (map->IsDungeon() && pUnit)
+                            Map* pMap = pCreature->GetMap();
+                            if (pMap->IsDungeon() && pUnit)
                             {
                                 pUnit->SetVisibility(VISIBILITY_OFF);
-                                Map::PlayerList const &PlayerList = map->GetPlayers();
+                                Map::PlayerList const &PlayerList = pMap->GetPlayers();
                                 if (PlayerList.isEmpty())
                                      return;
 
@@ -209,7 +209,7 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
             case DATA_RESET_TRASH_COUNT:    Trash = 0;            break;
 
             case DATA_TRASH:
-                if(data) Trash = data;
+                if (data) Trash = data;
                 else     Trash--;
                 UpdateWorldState(WORLD_STATE_ENEMYCOUNT, Trash);
                 break;
@@ -238,7 +238,7 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
                 break;
             case DATA_RAIDDAMAGE:
                 RaidDamage += data;
-                if(RaidDamage >= MINRAIDDAMAGE)
+                if (RaidDamage >= MINRAIDDAMAGE)
                     RaidDamage = MINRAIDDAMAGE;
                 break;
             case DATA_RESET_RAIDDAMAGE:
@@ -248,7 +248,7 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
 
          debug_log("TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)",type,data);
 
-        if(data == DONE)
+        if (data == DONE)
         {
             OUT_SAVE_INST_DATA;
 
@@ -291,8 +291,8 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
         {
                 for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                 {
-                    if (Player* player = itr->getSource())
-                        player->SendUpdateWorldState(id,state);
+                    if (Player* pPlayer = itr->getSource())
+                        pPlayer->SendUpdateWorldState(id,state);
                 }
         }else debug_log("TSCR: Instance Hyjal: UpdateWorldState, but PlayerList is empty!");
     }
@@ -314,15 +314,15 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
         std::istringstream loadStream(in);
         loadStream >> Encounters[0] >> Encounters[1] >> Encounters[2] >> Encounters[3] >> Encounters[4] >> allianceRetreat >> hordeRetreat >> RaidDamage;
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS)                // Do not load an encounter as IN_PROGRESS - reset it instead.
+            if (Encounters[i] == IN_PROGRESS)                // Do not load an encounter as IN_PROGRESS - reset it instead.
                 Encounters[i] = NOT_STARTED;
         OUT_LOAD_INST_DATA_COMPLETE;
     }
 };
 
-InstanceData* GetInstanceData_instance_mount_hyjal(Map* map)
+InstanceData* GetInstanceData_instance_mount_hyjal(Map* pMap)
 {
-    return new instance_mount_hyjal(map);
+    return new instance_mount_hyjal(pMap);
 }
 
 void AddSC_instance_mount_hyjal()
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
index 55676fb4f50..cac636c402d 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
@@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL boss_captain_skarlocAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Holy_Light
@@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL boss_captain_skarlocAI : public ScriptedAI
         }else Holy_Light_Timer -= diff;
 
         //Cleanse
-        if(Cleanse_Timer  < diff)
+        if (Cleanse_Timer  < diff)
         {
             DoCast(m_creature, SPELL_CLEANSE);
             Cleanse_Timer = 10000;
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
index 781cb8fd1d6..af3784f344c 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
@@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL boss_epoch_hunterAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Sand Breath
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
index e219c8f72a6..f48b83d4567 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 ## go_barrel_old_hillsbrad
 ######*/
 
-bool GOHello_go_barrel_old_hillsbrad(Player *player, GameObject* _GO)
+bool GOHello_go_barrel_old_hillsbrad(Player* pPlayer, GameObject* _GO)
 {
     ScriptedInstance* pInstance = _GO->GetInstanceData();
 
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
index 87fff64bfad..a83deb93aaa 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
@@ -37,7 +37,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
 {
-    instance_old_hillsbrad(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_old_hillsbrad(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounter[ENCOUNTERS];
     uint32 mBarrelCount;
@@ -84,12 +84,12 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
         {
             for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
             {
-                if (Player* player = itr->getSource())
+                if (Player* pPlayer = itr->getSource())
                 {
-                    player->SendUpdateWorldState(WORLD_STATE_OH,mBarrelCount);
+                    pPlayer->SendUpdateWorldState(WORLD_STATE_OH,mBarrelCount);
 
                     if (mBarrelCount == 5)
-                        player->KilledMonsterCredit(LODGE_QUEST_TRIGGER,0);
+                        pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER,0);
                 }
             }
         }else
@@ -114,9 +114,9 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
 
     void SetData(uint32 type, uint32 data)
     {
-        Player *player = GetPlayerInMap();
+        Player* pPlayer = GetPlayerInMap();
 
-        if (!player)
+        if (!pPlayer)
         {
             debug_log("TSCR: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any player.", type, data);
             return;
@@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
 
                     if (mBarrelCount == 5)
                     {
-                    player->SummonCreature(DRAKE_ENTRY,2128.43,71.01,64.42,1.74,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000);
+                    pPlayer->SummonCreature(DRAKE_ENTRY,2128.43,71.01,64.42,1.74,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000);
                     Encounter[0] = DONE;
                     }
                 }
@@ -148,9 +148,9 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
             }
             case TYPE_THRALL_EVENT:
             {
-                if( data == FAIL )
+                if (data == FAIL)
                 {
-                    if( mThrallEventCount <= 20 )
+                    if (mThrallEventCount <= 20)
                     {
                         mThrallEventCount++;
                         Encounter[1] = NOT_STARTED;
@@ -160,7 +160,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
                         Encounter[4] = NOT_STARTED;
                         Encounter[5] = NOT_STARTED;
                     }
-                    else if( mThrallEventCount > 20 )
+                    else if (mThrallEventCount > 20)
                     {
                         Encounter[1] = data;
                         Encounter[2] = data;
@@ -228,9 +228,9 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
         return 0;
     }
 };
-InstanceData* GetInstanceData_instance_old_hillsbrad(Map* map)
+InstanceData* GetInstanceData_instance_old_hillsbrad(Map* pMap)
 {
-    return new instance_old_hillsbrad(map);
+    return new instance_old_hillsbrad(pMap);
 }
 
 void AddSC_instance_old_hillsbrad()
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
index 87d1d69dbdf..8ca019c077f 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
@@ -41,38 +41,38 @@ EndContentData */
 ## npc_erozion
 ######*/
 
-bool GossipHello_npc_erozion(Player *player, Creature *_Creature)
+bool GossipHello_npc_erozion(Player* pPlayer, Creature *_Creature)
 {
-    if( _Creature->isQuestGiver() )
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
     ScriptedInstance* pInstance = (_Creature->GetInstanceData());
-    if( pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !player->HasItemCount(ITEM_ENTRY_BOMBS,1) )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need a pack of Incendiary Bombs.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS,1))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need a pack of Incendiary Bombs.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    if( !player->GetQuestRewardStatus(QUEST_ENTRY_RETURN) && player->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Teleport please, i'm tired.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+    if (!pPlayer->GetQuestRewardStatus(QUEST_ENTRY_RETURN) && pPlayer->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Teleport please, i'm tired.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
 
-    player->SEND_GOSSIP_MENU(9778, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(9778, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_erozion(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_erozion(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_INFO_DEF+1 )
+    if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
         ItemPosCountVec dest;
-        uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_ENTRY_BOMBS, 1);
-        if( msg == EQUIP_ERR_OK )
+        uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_ENTRY_BOMBS, 1);
+        if (msg == EQUIP_ERR_OK)
         {
-             player->StoreNewItem(dest, ITEM_ENTRY_BOMBS, true);
+             pPlayer->StoreNewItem(dest, ITEM_ENTRY_BOMBS, true);
         }
-        player->SEND_GOSSIP_MENU(9515, _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(9515, _Creature->GetGUID());
     }
-    if( action == GOSSIP_ACTION_INFO_DEF+2 )
+    if (action == GOSSIP_ACTION_INFO_DEF+2)
     {
-        player->CLOSE_GOSSIP_MENU();
+        pPlayer->CLOSE_GOSSIP_MENU();
     }
     return true;
 }
@@ -194,7 +194,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
         if (!pInstance)
             return;
 
-        switch( i )
+        switch(i)
         {
             case 8:
                 SetRun(false);
@@ -340,9 +340,9 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
                     }
 
                     //kill credit creature for quest
-                    Map *map = m_creature->GetMap();
-                    Map::PlayerList const& players = map->GetPlayers();
-                    if (!players.isEmpty() && map->IsDungeon())
+                    Map* pMap = m_creature->GetMap();
+                    Map::PlayerList const& players = pMap->GetPlayers();
+                    if (!players.isEmpty() && pMap->IsDungeon())
                     {
                         for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         {
@@ -367,10 +367,10 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
     {
         LowHp = false;
 
-        if( HadMount )
+        if (HadMount)
             DoMount();
 
-        if( !IsBeingEscorted )
+        if (!IsBeingEscorted)
         {
             DoUnmount();
             HadMount = false;
@@ -378,7 +378,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
             m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0);
             m_creature->SetDisplayId(THRALL_MODEL_UNEQUIPPED);
         }
-        if( IsBeingEscorted )
+        if (IsBeingEscorted)
         {
             switch(rand()%3)
             {
@@ -412,7 +412,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
         case 2: DoScriptText(SAY_TH_RANDOM_AGGRO3, m_creature); break;
         case 3: DoScriptText(SAY_TH_RANDOM_AGGRO4, m_creature); break;
         }
-        if( m_creature->IsMounted() )
+        if (m_creature->IsMounted())
         {
             DoUnmount();
             HadMount = true;
@@ -451,7 +451,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
             pInstance->SetData(TYPE_THRALL_EVENT,FAIL);
 
         // Don't do a yell if he kills self (if player goes too far or at the end).
-        if(slayer == m_creature)
+        if (slayer == m_creature)
             return;
 
         switch(rand()%2)
@@ -469,7 +469,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
             return;
 
              //TODO: add his abilities'n-crap here
-            if( !LowHp && ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 20) )
+            if (!LowHp && ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 20))
             {
                 switch(rand()%2)
                 {
@@ -490,46 +490,46 @@ CreatureAI* GetAI_npc_thrall_old_hillsbrad(Creature *_Creature)
     return thrall_walkAI;
 }
 
-bool GossipHello_npc_thrall_old_hillsbrad(Player *player, Creature *_Creature)
+bool GossipHello_npc_thrall_old_hillsbrad(Player* pPlayer, Creature *_Creature)
 {
-    if( _Creature->isQuestGiver() )
+    if (_Creature->isQuestGiver())
     {
-        player->PrepareQuestMenu( _Creature->GetGUID() );
-        player->SendPreparedQuest(_Creature->GetGUID());
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
+        pPlayer->SendPreparedQuest(_Creature->GetGUID());
     }
 
     ScriptedInstance* pInstance = (_Creature->GetInstanceData());
-    if( pInstance )
+    if (pInstance)
     {
         if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE && !pInstance->GetData(TYPE_THRALL_EVENT))
         {
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Start walking.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-            player->SEND_GOSSIP_MENU(GOSSIP_ID_START, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Start walking.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START, _Creature->GetGUID());
         }
 
-        if( pInstance->GetData(TYPE_THRALL_PART1) == DONE && !pInstance->GetData(TYPE_THRALL_PART2) )
+        if (pInstance->GetData(TYPE_THRALL_PART1) == DONE && !pInstance->GetData(TYPE_THRALL_PART2))
         {
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC1, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC1, _Creature->GetGUID());
         }
 
-        if( pInstance->GetData(TYPE_THRALL_PART2) == DONE && !pInstance->GetData(TYPE_THRALL_PART3) )
+        if (pInstance->GetData(TYPE_THRALL_PART2) == DONE && !pInstance->GetData(TYPE_THRALL_PART3))
         {
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TARREN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-            player->SEND_GOSSIP_MENU(GOSSIP_ID_TARREN, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TARREN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_TARREN, _Creature->GetGUID());
         }
     }
     return true;
 }
 
-bool GossipSelect_npc_thrall_old_hillsbrad(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     ScriptedInstance* pInstance = (_Creature->GetInstanceData());
-    switch( action )
+    switch(action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->CLOSE_GOSSIP_MENU();
-            if(pInstance)
+            pPlayer->CLOSE_GOSSIP_MENU();
+            if (pInstance)
             {
                 pInstance->SetData(TYPE_THRALL_EVENT,IN_PROGRESS);
                 pInstance->SetData(TYPE_THRALL_PART1,IN_PROGRESS);
@@ -537,21 +537,21 @@ bool GossipSelect_npc_thrall_old_hillsbrad(Player *player, Creature *_Creature,
 
             DoScriptText(SAY_TH_START_EVENT_PART1, _Creature);
 
-            CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, true, player->GetGUID());
+            CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, true, pPlayer->GetGUID());
             CAST_AI(npc_escortAI, (_Creature->AI()))->SetMaxPlayerDistance(100.0f);//not really needed, because it will not despawn if player is too far
             CAST_AI(npc_escortAI, (_Creature->AI()))->SetDespawnAtEnd(false);
             CAST_AI(npc_escortAI, (_Creature->AI()))->SetDespawnAtFar(false);
             break;
 
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20);
-            player->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC2, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC2, _Creature->GetGUID());
             break;
 
         case GOSSIP_ACTION_INFO_DEF+20:
-            player->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, _Creature->GetGUID());
             _Creature->SummonCreature(SKARLOC_MOUNT,2038.81,270.26,63.20,5.41,TEMPSUMMON_TIMED_DESPAWN,12000);
-            if(pInstance)
+            if (pInstance)
                 pInstance->SetData(TYPE_THRALL_PART2,IN_PROGRESS);
 
             DoScriptText(SAY_TH_START_EVENT_PART2, _Creature);
@@ -560,8 +560,8 @@ bool GossipSelect_npc_thrall_old_hillsbrad(Player *player, Creature *_Creature,
             break;
 
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->CLOSE_GOSSIP_MENU();
-            if(pInstance)
+            pPlayer->CLOSE_GOSSIP_MENU();
+            if (pInstance)
                 pInstance->SetData(TYPE_THRALL_PART3,IN_PROGRESS);
             CAST_AI(npc_thrall_old_hillsbradAI, _Creature->AI())->StartWP();
             break;
@@ -589,7 +589,7 @@ struct TRINITY_DLL_DECL npc_tarethaAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        switch( i )
+        switch(i)
         {
             case 6:
                 DoScriptText(SAY_TA_FREE, m_creature);
@@ -616,40 +616,40 @@ CreatureAI* GetAI_npc_taretha(Creature *_Creature)
     return taretha_walkAI;
 }
 
-bool GossipHello_npc_taretha(Player *player, Creature *_Creature)
+bool GossipHello_npc_taretha(Player* pPlayer, Creature *_Creature)
 {
     ScriptedInstance* pInstance = (_Creature->GetInstanceData());
-    if( pInstance && pInstance->GetData(TYPE_THRALL_PART3) == DONE && pInstance->GetData(TYPE_THRALL_PART4) == NOT_STARTED)
+    if (pInstance && pInstance->GetData(TYPE_THRALL_PART3) == DONE && pInstance->GetData(TYPE_THRALL_PART4) == NOT_STARTED)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH1, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH1, _Creature->GetGUID());
     }
     return true;
 }
 
-bool GossipSelect_npc_taretha(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_taretha(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     ScriptedInstance* pInstance = (_Creature->GetInstanceData());
-    if( action == GOSSIP_ACTION_INFO_DEF+1 )
+    if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-        player->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH2, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+        pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH2, _Creature->GetGUID());
     }
-    if( action == GOSSIP_ACTION_INFO_DEF+2 )
+    if (action == GOSSIP_ACTION_INFO_DEF+2)
     {
-        player->CLOSE_GOSSIP_MENU();
+        pPlayer->CLOSE_GOSSIP_MENU();
 
-        if( pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS )
+        if (pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS)
         {
-            if(pInstance)
+            if (pInstance)
                 pInstance->SetData(TYPE_THRALL_PART4,IN_PROGRESS);
-            if(pInstance->GetData64(DATA_EPOCH) == 0)
+            if (pInstance->GetData64(DATA_EPOCH) == 0)
                  _Creature->SummonCreature(ENTRY_EPOCH,2639.13,698.55,65.43,4.59,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000);
 
              if (uint64 ThrallGUID = pInstance->GetData64(DATA_THRALL))
              {
                  Creature* Thrall = (Unit::GetCreature((*_Creature), ThrallGUID));
-                 if(Thrall)
+                 if (Thrall)
                      CAST_AI(npc_thrall_old_hillsbradAI, Thrall->AI())->StartWP();
              }
         }
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
index b07b4790f64..1c0f77af73c 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
@@ -122,7 +122,7 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI
 
 
 
-        if(pInstance)
+        if (pInstance)
         {
             uint64 RAdvisors[3];
             RAdvisors[0] = pInstance->GetData64(DATA_SHARKKIS);
@@ -130,12 +130,12 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI
             RAdvisors[2] = pInstance->GetData64(DATA_CARIBDIS);
             //Respawn of the 3 Advisors
             Creature* pAdvisor = NULL;
-            for( int i=0; i<3; ++i )
+            for(int i=0; i<3; ++i)
 
-            if(RAdvisors[i])
+            if (RAdvisors[i])
             {
                 pAdvisor = (Unit::GetCreature((*m_creature), RAdvisors[i]));
-                if(pAdvisor && !pAdvisor->isAlive())
+                if (pAdvisor && !pAdvisor->isAlive())
                 {
                     pAdvisor->Respawn();
                     pAdvisor->AI()->EnterEvadeMode();
@@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //someone evaded!
@@ -251,13 +251,13 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI
             if (!target)
                 target = m_creature->getVictim();
 
-            if(target)
+            if (target)
                 DoCast(target, SPELL_CATACLYSMIC_BOLT);
             CataclysmicBolt_Timer = 10000;
         }else CataclysmicBolt_Timer -= diff;
 
         //SearNova_Timer
-        if(SearNova_Timer < diff)
+        if (SearNova_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SEAR_NOVA);
             SearNova_Timer = 20000+rand()%40000;
@@ -277,19 +277,19 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI
             bool continueTriggering;
             Creature* Advisor;
             for(uint8 i = 0; i < 4; ++i)
-                if(Advisors[i])
+                if (Advisors[i])
                 {
                     Advisor = (Unit::GetCreature(*m_creature, Advisors[i]));
-                    if(Advisor)
+                    if (Advisor)
                     {
-                        if(Advisor->isAlive())
+                        if (Advisor->isAlive())
                         {
                             continueTriggering = true;
                             break;
                         }
                     }
                 }
-                if( continueTriggering )
+                if (continueTriggering)
                 {
                     DoCast(m_creature, SPELL_BLESSING_OF_THE_TIDES);
                     DoYell(SAY_GAIN_BLESSING_OF_TIDES, LANG_UNIVERSAL, NULL);
@@ -331,14 +331,14 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI
         pet = false;
 
         Creature *Pet = Unit::GetCreature(*m_creature, SummonedPet);
-        if( Pet && Pet->isAlive() )
+        if (Pet && Pet->isAlive())
         {
-            Pet->DealDamage( Pet, Pet->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false );
+            Pet->DealDamage(Pet, Pet->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
         }
 
         SummonedPet = 0;
 
-        if( pInstance )
+        if (pInstance)
             pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED);
     }
 
@@ -378,7 +378,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //someone evaded!
@@ -389,38 +389,38 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI
         }
 
         //LeechingThrow_Timer
-        if(LeechingThrow_Timer < diff)
+        if (LeechingThrow_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_LEECHING_THROW);
             LeechingThrow_Timer = 20000;
         }else LeechingThrow_Timer -= diff;
 
         //Multishot_Timer
-        if(Multishot_Timer < diff)
+        if (Multishot_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_MULTISHOT);
             Multishot_Timer = 20000;
         }else Multishot_Timer -= diff;
 
         //TheBeastWithin_Timer
-        if(TheBeastWithin_Timer < diff)
+        if (TheBeastWithin_Timer < diff)
         {
             DoCast(m_creature, SPELL_THE_BEAST_WITHIN);
             Creature *Pet = Unit::GetCreature(*m_creature, SummonedPet);
-            if( Pet && Pet->isAlive() )
+            if (Pet && Pet->isAlive())
             {
-                Pet->CastSpell( Pet, SPELL_PET_ENRAGE, true );
+                Pet->CastSpell(Pet, SPELL_PET_ENRAGE, true);
             }
             TheBeastWithin_Timer = 30000;
         }else TheBeastWithin_Timer -= diff;
 
         //Pet_Timer
-        if(Pet_Timer < diff && pet == false)
+        if (Pet_Timer < diff && pet == false)
         {
             pet = true;
             //uint32 spell_id;
             uint32 pet_id;
-            switch( rand()%2 )
+            switch(rand()%2)
             {
             case 0:
                 //spell_id = SPELL_SUMMON_FATHOM_LURKER;
@@ -431,8 +431,8 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI
                 pet_id = CREATURE_FATHOM_SPOREBAT;
                 break;
             }
-            //DoCast( m_creature, spell_id, true );
-            Creature *Pet = DoSpawnCreature(pet_id,0,0,0,0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000 );
+            //DoCast(m_creature, spell_id, true);
+            Creature *Pet = DoSpawnCreature(pet_id,0,0,0,0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0);
             if (Pet && target)
             {
@@ -479,7 +479,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI
             Karathress = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_KARATHRESS)));
 
             if (Karathress)
-                if(!m_creature->isAlive() && Karathress)
+                if (!m_creature->isAlive() && Karathress)
                     CAST_AI(boss_fathomlord_karathressAI, Karathress->AI())->EventTidalvessDeath();
         }
     }
@@ -508,7 +508,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //someone evaded!
@@ -518,7 +518,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI
             return;
         }
 
-        if( !m_creature->HasAura(SPELL_WINDFURY_WEAPON) )
+        if (!m_creature->HasAura(SPELL_WINDFURY_WEAPON))
         {
             DoCast(m_creature, SPELL_WINDFURY_WEAPON);
         }
@@ -531,26 +531,26 @@ struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI
         }else FrostShock_Timer -= diff;
 
         //Spitfire_Timer
-        if(Spitfire_Timer < diff)
+        if (Spitfire_Timer < diff)
         {
             DoCast(m_creature, SPELL_SPITFIRE_TOTEM);
-            Unit *SpitfireTotem = Unit::GetUnit( *m_creature, CREATURE_SPITFIRE_TOTEM );
-            if( SpitfireTotem )
+            Unit *SpitfireTotem = Unit::GetUnit(*m_creature, CREATURE_SPITFIRE_TOTEM);
+            if (SpitfireTotem)
             {
-                CAST_CRE(SpitfireTotem)->AI()->AttackStart( m_creature->getVictim() );
+                CAST_CRE(SpitfireTotem)->AI()->AttackStart(m_creature->getVictim());
             }
             Spitfire_Timer = 60000;
         }else Spitfire_Timer -= diff;
 
         //PoisonCleansing_Timer
-        if(PoisonCleansing_Timer < diff)
+        if (PoisonCleansing_Timer < diff)
         {
             DoCast(m_creature, SPELL_POISON_CLEANSING_TOTEM);
             PoisonCleansing_Timer = 30000;
         }else PoisonCleansing_Timer -= diff;
 
         //Earthbind_Timer
-        if(Earthbind_Timer < diff)
+        if (Earthbind_Timer < diff)
         {
             DoCast(m_creature, SPELL_EARTHBIND_TOTEM);
             Earthbind_Timer = 45000;
@@ -594,7 +594,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI
             Karathress = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_KARATHRESS)));
 
             if (Karathress)
-                if(!m_creature->isAlive() && Karathress)
+                if (!m_creature->isAlive() && Karathress)
                     CAST_AI(boss_fathomlord_karathressAI, Karathress->AI())->EventCaribdisDeath();
         }
     }
@@ -622,7 +622,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //someone evaded!
@@ -644,24 +644,24 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI
         {
             DoCast(m_creature->getVictim(), SPELL_TIDAL_SURGE);
             // Hacky way to do it - won't trigger elseways
-            m_creature->getVictim()->CastSpell( m_creature->getVictim(), SPELL_TIDAL_SURGE_FREEZE, true );
+            m_creature->getVictim()->CastSpell(m_creature->getVictim(), SPELL_TIDAL_SURGE_FREEZE, true);
             TidalSurge_Timer = 15000+rand()%5000;
         }else TidalSurge_Timer -= diff;
 
         //Cyclone_Timer
-        if(Cyclone_Timer < diff)
+        if (Cyclone_Timer < diff)
         {
             //DoCast(m_creature, SPELL_SUMMON_CYCLONE); // Doesn't work
             Cyclone_Timer = 30000+rand()%10000;
             Creature *Cyclone = m_creature->SummonCreature(CREATURE_CYCLONE, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), (rand()%5), TEMPSUMMON_TIMED_DESPAWN, 15000);
-            if( Cyclone )
+            if (Cyclone)
             {
                 CAST_CRE(Cyclone)->SetFloatValue(OBJECT_FIELD_SCALE_X, 3.0f);
                 Cyclone->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 Cyclone->setFaction(m_creature->getFaction());
                 Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_CYCLONE, true);
                 Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                if( target )
+                if (target)
                 {
                     Cyclone->AI()->AttackStart(target);
                 }
@@ -669,17 +669,17 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI
         }else Cyclone_Timer -= diff;
 
         //Heal_Timer
-        if(Heal_Timer < diff)
+        if (Heal_Timer < diff)
         {
             // It can be cast on any of the mobs
             Unit *pUnit = NULL;
 
-            while( pUnit == NULL || !pUnit->isAlive() )
+            while(pUnit == NULL || !pUnit->isAlive())
             {
                 pUnit = selectAdvisorUnit();
             }
 
-            if(pUnit && pUnit->isAlive())
+            if (pUnit && pUnit->isAlive())
                 DoCast(pUnit, SPELL_HEAL);
             Heal_Timer = 60000;
         }else Heal_Timer -= diff;
@@ -690,7 +690,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI
     Unit* selectAdvisorUnit()
     {
         Unit* pUnit = NULL;
-        if(pInstance)
+        if (pInstance)
         {
             switch(rand()%4)
             {
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
index 4d2a34d53bc..a6ae11b069d 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
@@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI
         m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
         m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false);
 
-        m_creature->SetDisplayId( MODEL_CLEAN);
+        m_creature->SetDisplayId(MODEL_CLEAN);
 
         if (pInstance)
             pInstance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, NOT_STARTED);
@@ -125,7 +125,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI
     void SummonBeams()
     {
         Creature* beamer = m_creature->SummonCreature(ENTRY_BEAM_DUMMY,-258.333,-356.34,22.0499,5.90835,TEMPSUMMON_CORPSE_DESPAWN,0);
-        if(beamer)
+        if (beamer)
         {
             beamer->CastSpell(m_creature,SPELL_BLUE_BEAM,true);
             beamer->SetDisplayId(11686);  //invisible
@@ -133,7 +133,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI
             beams[0]=beamer->GetGUID();
         }
         beamer = beamer = m_creature->SummonCreature(ENTRY_BEAM_DUMMY,-219.918,-371.308,22.0042,2.73072,TEMPSUMMON_CORPSE_DESPAWN,0);
-        if(beamer)
+        if (beamer)
         {
             beamer->CastSpell(m_creature,SPELL_BLUE_BEAM,true);
             beamer->SetDisplayId(11686);  //invisible
@@ -146,7 +146,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI
         for(uint8 i=0;i<2; ++i)
         {
             Creature* mob = Unit::GetCreature(*m_creature,beams[i]);
-            if(mob)
+            if (mob)
             {
                 mob->setDeathState(DEAD);
                 mob->RemoveCorpse();
@@ -216,13 +216,13 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!beam)
+        if (!beam)
         {
             SummonBeams();
             beam=true;
         }
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         // corrupted form
@@ -270,7 +270,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI
                 if (m_creature->IsWithinDist2d(HYDROSS_X, HYDROSS_Y, SWITCH_RADIUS))
                 {
                     // switch to clean form
-                    m_creature->SetDisplayId( MODEL_CLEAN);
+                    m_creature->SetDisplayId(MODEL_CLEAN);
                     CorruptedForm = false;
                     MarkOfHydross_Count = 0;
 
@@ -337,7 +337,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI
                 if (!m_creature->IsWithinDist2d(HYDROSS_X, HYDROSS_Y, SWITCH_RADIUS))
                 {
                     // switch to corrupted form
-                    m_creature->SetDisplayId( MODEL_CORRUPT);
+                    m_creature->SetDisplayId(MODEL_CORRUPT);
                     MarkOfCorruption_Count = 0;
                     CorruptedForm = true;
 
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
index 0a1c03bac93..990905f3133 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
@@ -180,7 +180,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
         Phase = 0;
 
         Entangle = false;
-        if(JustCreated)
+        if (JustCreated)
         {
             CanAttack = false;
             JustCreated = false;
@@ -194,7 +194,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
                 remo->setDeathState(JUST_DIED);
         }
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_LADYVASHJEVENT, NOT_STARTED);
         ShieldGeneratorChannel[0] = 0;
         ShieldGeneratorChannel[1] = 0;
@@ -208,7 +208,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
     void EventTaintedElementalDeath()
     {
         //the next will spawn 50 seconds after the previous one's death
-        if(TaintedElemental_Timer > 50000)
+        if (TaintedElemental_Timer > 50000)
             TaintedElemental_Timer = 50000;
     }
     void KilledUnit(Unit *victim)
@@ -225,7 +225,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
     {
         DoScriptText(SAY_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_LADYVASHJEVENT, DONE);
     }
 
@@ -241,7 +241,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
 
         Phase = 1;
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS);
     }
 
@@ -250,11 +250,11 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
         if (pInstance)
         {
             //remove old tainted cores to prevent cheating in phase 2
-            Map *map = m_creature->GetMap();
-            Map::PlayerList const &PlayerList = map->GetPlayers();
+            Map* pMap = m_creature->GetMap();
+            Map::PlayerList const &PlayerList = pMap->GetPlayers();
             for(Map::PlayerList::const_iterator i = PlayerList.begin();i != PlayerList.end(); ++i)
             {
-                if(Player* i_pl = i->getSource())
+                if (Player* i_pl = i->getSource())
                 {
                     i_pl->DestroyItemCount(31088, 1, true);
                 }
@@ -262,7 +262,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
         }
         StartEvent();//this is EnterCombat(), so were are 100% in combat, start the event
 
-        if(Phase != 2)
+        if (Phase != 2)
             AttackStart(who);        
     }
 
@@ -283,13 +283,13 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
             float attackRadius = m_creature->GetAttackDistance(who);
             if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= CREATURE_Z_ATTACK_RANGE && m_creature->IsWithinLOSInMap(who))
             {
-                //if(who->HasStealthAura())
+                //if (who->HasStealthAura())
                 //    who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
 
-                if(!m_creature->isInCombat())//AttackStart() sets UNIT_FLAG_IN_COMBAT, so this msut be before attacking
+                if (!m_creature->isInCombat())//AttackStart() sets UNIT_FLAG_IN_COMBAT, so this msut be before attacking
                     StartEvent();
 
-                if(Phase != 2)
+                if (Phase != 2)
                     AttackStart(who);                
             }
         }
@@ -310,7 +310,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
                 DoCast(m_creature->getVictim(), SPELL_MULTI_SHOT);
                 break;
         }
-        if(rand()%3)
+        if (rand()%3)
         {
             switch(rand()%2)
             {
@@ -322,9 +322,9 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!CanAttack && Intro)
+        if (!CanAttack && Intro)
         {
-            if(AggroTimer < diff)
+            if (AggroTimer < diff)
             {
                 CanAttack = true;
                 m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -336,16 +336,16 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
             }
         }
         //to prevent abuses during phase 2
-        if(Phase == 2 && !m_creature->getVictim() && m_creature->isInCombat())
+        if (Phase == 2 && !m_creature->getVictim() && m_creature->isInCombat())
         {
             EnterEvadeMode();
             return;
         }
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(Phase == 1 || Phase == 3)
+        if (Phase == 1 || Phase == 3)
         {
             //ShockBlast_Timer
             if (ShockBlast_Timer < diff)
@@ -359,14 +359,14 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
             }else ShockBlast_Timer -= diff;
 
             //StaticCharge_Timer
-            if(StaticCharge_Timer < diff)
+            if (StaticCharge_Timer < diff)
             {
                 //Static Charge
                 //Used on random people (only 1 person at any given time) in Phases 1 and 3, it's a debuff doing 2775 to 3225 Nature damage to the target and everybody in about 5 yards around it, every 1 seconds for 30 seconds. It can be removed by Cloak of Shadows, Iceblock, Divine Shield, etc, but not by Cleanse or Dispel Magic.
                 Unit *target = NULL;
                 target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true);
 
-                if(target && !target->HasAura(SPELL_STATIC_CHARGE_TRIGGER))
+                if (target && !target->HasAura(SPELL_STATIC_CHARGE_TRIGGER))
                                                             //cast Static Charge every 2 seconds for 20 seconds
                         DoCast(target, SPELL_STATIC_CHARGE_TRIGGER);
 
@@ -376,7 +376,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
             //Entangle_Timer
             if (Entangle_Timer < diff)
             {
-                if(!Entangle)
+                if (!Entangle)
                 {
                     //Entangle
                     //Used in Phases 1 and 3, it casts Entangling Roots on everybody in a 15 yard radius of Vashj, immobilzing them for 10 seconds and dealing 500 damage every 2 seconds. It's not a magic effect so it cannot be dispelled, but is removed by various buffs such as Cloak of Shadows or Blessing of Freedom.
@@ -393,7 +393,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
             }else Entangle_Timer -= diff;
 
             //Phase 1
-            if(Phase == 1)
+            if (Phase == 1)
             {
                 //Start phase 2
                 if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 70)
@@ -418,26 +418,26 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
             else
             {
                 //SummonSporebat_Timer
-                if(SummonSporebat_Timer < diff)
+                if (SummonSporebat_Timer < diff)
                 {
                     Creature *Sporebat = NULL;
                     Sporebat = m_creature->SummonCreature(TOXIC_SPOREBAT, SPOREBAT_X, SPOREBAT_Y, SPOREBAT_Z, SPOREBAT_O, TEMPSUMMON_CORPSE_DESPAWN, 0);
 
-                    if(Sporebat)
+                    if (Sporebat)
                     {
                         Unit *target = NULL;
                         target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                        if(target)
+                        if (target)
                             Sporebat->AI()->AttackStart(target);
                     }
 
                     //summon sporebats faster and faster
-                    if(SummonSporebat_StaticTimer > 1000)
+                    if (SummonSporebat_StaticTimer > 1000)
                         SummonSporebat_StaticTimer -= 1000;
 
                     SummonSporebat_Timer = SummonSporebat_StaticTimer;
 
-                    if(SummonSporebat_Timer < 5000)
+                    if (SummonSporebat_Timer < 5000)
                         SummonSporebat_Timer = 5000;
 
                 }else SummonSporebat_Timer -= diff;
@@ -447,7 +447,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
             DoMeleeAttackIfReady();
 
             //Check_Timer - used to check if somebody is in melee range
-            if(Check_Timer < diff)
+            if (Check_Timer < diff)
             {
                 bool InMeleeRange = false;
                 Unit *target;
@@ -456,7 +456,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
                 {
                     target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
                                                             //if in melee range
-                    if(target && target->IsWithinDistInMap(m_creature, 5))
+                    if (target && target->IsWithinDistInMap(m_creature, 5))
                     {
                         InMeleeRange = true;
                         break;
@@ -464,7 +464,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
                 }
 
                 //if nobody is in melee range
-                if(!InMeleeRange)
+                if (!InMeleeRange)
                     CastShootOrMultishot();
 
                 Check_Timer = 5000;
@@ -474,14 +474,14 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
         else
         {
             //ForkedLightning_Timer
-            if(ForkedLightning_Timer < diff)
+            if (ForkedLightning_Timer < diff)
             {
                 //Forked Lightning
                 //Used constantly in Phase 2, it shoots out completely randomly targeted bolts of lightning which hit everybody in a roughtly 60 degree cone in front of Vashj for 2313-2687 nature damage.
                 Unit *target = NULL;
                 target = SelectUnit(SELECT_TARGET_RANDOM, 0);
 
-                if(!target)
+                if (!target)
                     target = m_creature->getVictim();
 
                 DoCast(target, SPELL_FORKED_LIGHTNING);
@@ -490,12 +490,12 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
             }else ForkedLightning_Timer -= diff;
 
             //EnchantedElemental_Timer
-            if(EnchantedElemental_Timer < diff)
+            if (EnchantedElemental_Timer < diff)
             {
                 Creature *Elemental;
                 Elemental = m_creature->SummonCreature(ENCHANTED_ELEMENTAL, ElementPos[EnchantedElemental_Pos][0], ElementPos[EnchantedElemental_Pos][1], ElementPos[EnchantedElemental_Pos][2], ElementPos[EnchantedElemental_Pos][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
 
-                if(EnchantedElemental_Pos == 7)
+                if (EnchantedElemental_Pos == 7)
                     EnchantedElemental_Pos = 0;
                 else
                     EnchantedElemental_Pos++;
@@ -504,7 +504,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
             }else EnchantedElemental_Timer -= diff;
 
             //TaintedElemental_Timer
-            if(TaintedElemental_Timer < diff)
+            if (TaintedElemental_Timer < diff)
             {
                 Creature *Tain_Elemental;
                 uint32 pos = rand()%8;
@@ -514,46 +514,46 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
             }else TaintedElemental_Timer -= diff;
 
             //CoilfangElite_Timer
-            if(CoilfangElite_Timer < diff)
+            if (CoilfangElite_Timer < diff)
             {
                 uint32 pos = rand()%3;
                 Creature* CoilfangElite = NULL;
                 CoilfangElite = m_creature->SummonCreature(COILFANG_ELITE, CoilfangElitePos[pos][0], CoilfangElitePos[pos][1], CoilfangElitePos[pos][2], CoilfangElitePos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                if(CoilfangElite)
+                if (CoilfangElite)
                 {
                     Unit *target = NULL;
                     target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                    if(target)
+                    if (target)
                         CoilfangElite->AI()->AttackStart(target);
-                    else if(m_creature->getVictim())
+                    else if (m_creature->getVictim())
                         CoilfangElite->AI()->AttackStart(m_creature->getVictim());
                 }
                 CoilfangElite_Timer = 45000+rand()%5000;
             }else CoilfangElite_Timer -= diff;
 
             //CoilfangStrider_Timer
-            if(CoilfangStrider_Timer < diff)
+            if (CoilfangStrider_Timer < diff)
             {
                 uint32 pos = rand()%3;
                 Creature* CoilfangStrider = NULL;
                 CoilfangStrider = m_creature->SummonCreature(COILFANG_STRIDER, CoilfangStriderPos[pos][0], CoilfangStriderPos[pos][1], CoilfangStriderPos[pos][2], CoilfangStriderPos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                 if(CoilfangStrider)
+                 if (CoilfangStrider)
                 {
                     Unit *target = NULL;
                     target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                    if(target)
+                    if (target)
                         CoilfangStrider->AI()->AttackStart(target);
-                    else if(m_creature->getVictim())
+                    else if (m_creature->getVictim())
                         CoilfangStrider->AI()->AttackStart(m_creature->getVictim());
                 }
                 CoilfangStrider_Timer = 60000+rand()%10000;
             }else CoilfangStrider_Timer -= diff;
 
             //Check_Timer
-            if(Check_Timer < diff)
+            if (Check_Timer < diff)
             {
                 //Start Phase 3
-                if(pInstance && pInstance->GetData(DATA_CANSTARTPHASE3))
+                if (pInstance && pInstance->GetData(DATA_CANSTARTPHASE3))
                 {
                     //set life 50%
                     m_creature->SetHealth(m_creature->GetMaxHealth()/2);
@@ -624,7 +624,7 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!pInstance)
+        if (!pInstance)
             return;
 
         if (!Vashj)
@@ -632,7 +632,7 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI
             return;
         }
 
-        if(move < diff)
+        if (move < diff)
         {
             m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
             if (phase == 1)
@@ -651,10 +651,10 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI
             if (phase == 3)
             {
                 m_creature->GetMotionMaster()->MovePoint(0, MIDDLE_X, MIDDLE_Y, MIDDLE_Z);
-                if(m_creature->IsWithinDist3d(MIDDLE_X, MIDDLE_Y, MIDDLE_Z, 3))
+                if (m_creature->IsWithinDist3d(MIDDLE_X, MIDDLE_Y, MIDDLE_Z, 3))
                 {
                     SpellEntry *spell = GET_SPELL(SPELL_SURGE);
-                    if( spell )
+                    if (spell)
                     {
                         uint8 eff_mask=0;
                         for (int i=0; i<3; ++i)
@@ -668,7 +668,7 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI
                     m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                 }
             }
-            if(!Vashj->isInCombat() || CAST_AI(boss_lady_vashjAI, Vashj->AI())->Phase != 2 || Vashj->isDead())
+            if (!Vashj->isInCombat() || CAST_AI(boss_lady_vashjAI, Vashj->AI())->Phase != 2 || Vashj->isDead())
             {
                 //call Unsummon()
                 m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
@@ -700,12 +700,12 @@ struct TRINITY_DLL_DECL mob_tainted_elementalAI : public ScriptedAI
 
     void JustDied(Unit *killer)
     {
-        if(pInstance)
+        if (pInstance)
         {
             Creature *Vashj = NULL;
             Vashj = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_LADYVASHJ)));
 
-            if(Vashj)
+            if (Vashj)
                 CAST_AI(boss_lady_vashjAI, Vashj->AI())->EventTaintedElementalDeath();
         }
     }
@@ -718,19 +718,19 @@ struct TRINITY_DLL_DECL mob_tainted_elementalAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //PoisonBolt_Timer
-        if(PoisonBolt_Timer < diff)
+        if (PoisonBolt_Timer < diff)
         {
             Unit *target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM, 0);
 
-            if(target && target->IsWithinDistInMap(m_creature, 30))
+            if (target && target->IsWithinDistInMap(m_creature, 30))
                 DoCast(target, SPELL_POISON_BOLT);
 
             PoisonBolt_Timer = 5000+rand()%5000;
         }else PoisonBolt_Timer -= diff;
 
         //Despawn_Timer
-        if(Despawn_Timer < diff)
+        if (Despawn_Timer < diff)
         {
             //call Unsummon()
             m_creature->setDeathState(DEAD);
@@ -780,10 +780,10 @@ struct TRINITY_DLL_DECL mob_toxic_sporebatAI : public ScriptedAI
 
     void MovementInform(uint32 type, uint32 id)
     {
-        if(type != POINT_MOTION_TYPE)
+        if (type != POINT_MOTION_TYPE)
             return;
 
-        if(id == 1)
+        if (id == 1)
             movement_timer = 0;
     }
 
@@ -798,14 +798,14 @@ struct TRINITY_DLL_DECL mob_toxic_sporebatAI : public ScriptedAI
         }else movement_timer -= diff;
 
         //toxic spores
-        if(bolt_timer < diff)
+        if (bolt_timer < diff)
         {
             Unit *target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-            if(target)
+            if (target)
             {
                 Creature* trig = m_creature->SummonCreature(TOXIC_SPORES_TRIGGER,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000);
-                if(trig)
+                if (trig)
                 {
                     trig->setFaction(14);
                     trig->CastSpell(trig, SPELL_TOXIC_SPORES,true);
@@ -816,14 +816,14 @@ struct TRINITY_DLL_DECL mob_toxic_sporebatAI : public ScriptedAI
         else bolt_timer -= diff;
 
         //Check_Timer
-        if(Check_Timer < diff)
+        if (Check_Timer < diff)
         {
-            if(pInstance)
+            if (pInstance)
             {
                 //check if vashj is death
                 Unit *Vashj = NULL;
                 Vashj = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_LADYVASHJ));
-                if(!Vashj || (Vashj && !Vashj->isAlive()) || (Vashj && CAST_AI(boss_lady_vashjAI, CAST_CRE(Vashj)->AI())->Phase != 3))
+                if (!Vashj || (Vashj && !Vashj->isAlive()) || (Vashj && CAST_AI(boss_lady_vashjAI, CAST_CRE(Vashj)->AI())->Phase != 3))
                 {
                     //remove
                     m_creature->setDeathState(DEAD);
@@ -900,15 +900,15 @@ struct TRINITY_DLL_DECL mob_shield_generator_channelAI : public ScriptedAI
 
     void UpdateAI (const uint32 diff)
     {
-        if(!pInstance)
+        if (!pInstance)
             return;
 
-        if(Check_Timer < diff)
+        if (Check_Timer < diff)
         {
             Unit *Vashj = NULL;
             Vashj = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_LADYVASHJ));
 
-            if(Vashj && Vashj->isAlive())
+            if (Vashj && Vashj->isAlive())
             {
                 //start visual channel
                 if (!Casted || !Vashj->HasAura(SPELL_MAGIC_BARRIER))
@@ -922,21 +922,21 @@ struct TRINITY_DLL_DECL mob_shield_generator_channelAI : public ScriptedAI
     }
 };
 
-bool ItemUse_item_tainted_core(Player *player, Item* _Item, SpellCastTargets const& targets)
+bool ItemUse_item_tainted_core(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
 {
-    ScriptedInstance *pInstance = (player->GetInstanceData()) ? (player->GetInstanceData()) : NULL;
+    ScriptedInstance *pInstance = (pPlayer->GetInstanceData()) ? (pPlayer->GetInstanceData()) : NULL;
 
-    if(!pInstance)
+    if (!pInstance)
     {
-        player->GetSession()->SendNotification("Instance script not initialized");
+        pPlayer->GetSession()->SendNotification("Instance script not initialized");
         return true;
     }
 
     Creature *Vashj = NULL;
-    Vashj = (Unit::GetCreature((*player), pInstance->GetData64(DATA_LADYVASHJ)));
-    if(Vashj && CAST_AI(boss_lady_vashjAI, Vashj->AI())->Phase == 2)
+    Vashj = (Unit::GetCreature((*pPlayer), pInstance->GetData64(DATA_LADYVASHJ)));
+    if (Vashj && CAST_AI(boss_lady_vashjAI, Vashj->AI())->Phase == 2)
     {
-        if(targets.getGOTarget() && targets.getGOTarget()->GetTypeId()==TYPEID_GAMEOBJECT)
+        if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId()==TYPEID_GAMEOBJECT)
         {
             uint32 identifier;
             uint8 channel_identifier;
@@ -962,16 +962,16 @@ bool ItemUse_item_tainted_core(Player *player, Item* _Item, SpellCastTargets con
                     return true;
             }
 
-            if(pInstance->GetData(identifier))
+            if (pInstance->GetData(identifier))
             {
-                player->GetSession()->SendNotification("Already deactivated");
+                pPlayer->GetSession()->SendNotification("Already deactivated");
                 return true;
             }
 
             //get and remove channel
             Unit *Channel = NULL;
             Channel = Unit::GetCreature(*Vashj, CAST_AI(boss_lady_vashjAI, Vashj->AI())->ShieldGeneratorChannel[channel_identifier]);
-            if(Channel)
+            if (Channel)
             {
                 //call Unsummon()
                 Channel->setDeathState(JUST_DIED);
@@ -980,15 +980,15 @@ bool ItemUse_item_tainted_core(Player *player, Item* _Item, SpellCastTargets con
             pInstance->SetData(identifier, 1);
 
             //remove this item
-            player->DestroyItemCount(31088, 1, true);
+            pPlayer->DestroyItemCount(31088, 1, true);
             return true;
         }
-        else if( targets.getUnitTarget()->GetTypeId() == TYPEID_UNIT )
+        else if (targets.getUnitTarget()->GetTypeId() == TYPEID_UNIT)
             return false;
-        else if(targets.getUnitTarget()->GetTypeId() == TYPEID_PLAYER)
+        else if (targets.getUnitTarget()->GetTypeId() == TYPEID_PLAYER)
         {
-            player->DestroyItemCount(31088, 1, true);
-            player->CastSpell(targets.getUnitTarget(), 38134, true);
+            pPlayer->DestroyItemCount(31088, 1, true);
+            pPlayer->CastSpell(targets.getUnitTarget(), 38134, true);
             return true;
         }
     }
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
index 9eecc66512a..8355c46d9ef 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
@@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL mob_inner_demonAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(done_by->GetGUID() != victimGUID && done_by->GetGUID() != m_creature->GetGUID())
+        if (done_by->GetGUID() != victimGUID && done_by->GetGUID() != m_creature->GetGUID())
         {
             damage = 0;
             DoModifyThreatPercent(done_by, -100);
@@ -117,24 +117,24 @@ struct TRINITY_DLL_DECL mob_inner_demonAI : public ScriptedAI
             {
                 m_creature->AddThreat(owner,999999);
                 AttackStart(owner);
-            }else if(owner && owner->isDead())
+            }else if (owner && owner->isDead())
             {
                 m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                 return;
             }
         }
 
-        if(Link_Timer < diff)
+        if (Link_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SOUL_LINK, true);
             Link_Timer = 1000;
         }else Link_Timer -= diff;
 
 
-        if(!m_creature->HasAura(AURA_DEMONIC_ALIGNMENT))
+        if (!m_creature->HasAura(AURA_DEMONIC_ALIGNMENT))
             DoCast(m_creature, AURA_DEMONIC_ALIGNMENT,true);
 
-        if(ShadowBolt_Timer < diff)
+        if (ShadowBolt_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SHADOWBOLT, false);
             ShadowBolt_Timer = 10000;
@@ -195,13 +195,13 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
         NeedThreatReset = false;
         EnrageUsed = false;
         InnderDemon_Count = 0;
-        m_creature->SetSpeed( MOVE_RUN, 2.0f, true);
-        m_creature->SetDisplayId( MODEL_NIGHTELF);
+        m_creature->SetSpeed(MOVE_RUN, 2.0f, true);
+        m_creature->SetDisplayId(MODEL_NIGHTELF);
         m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID  , 0);
         m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0);
         m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true);
         m_creature->SetCorpseDelay(1000*60*60);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, NOT_STARTED);
     }
 
@@ -209,7 +209,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
     {
         for(uint8 i = 0; i < 3; ++i)
         {
-            if(Creature *add = Unit::GetCreature(*m_creature,SpellBinderGUID[i]))
+            if (Creature *add = Unit::GetCreature(*m_creature,SpellBinderGUID[i]))
                 add->DisappearAndDie();
 
             float nx = x;
@@ -226,19 +226,19 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
     }
     void MoveInLineOfSight(Unit *who)
     {
-        if(m_creature->HasAura(AURA_BANISH))
+        if (m_creature->HasAura(AURA_BANISH))
             return;
 
-        if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
+        if (!m_creature->getVictim() && who->isTargetableForAttack() && (m_creature->IsHostileTo(who)) && who->isInAccessiblePlaceFor(m_creature))
         {
             if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
                 return;
 
             float attackRadius = m_creature->GetAttackDistance(who);
-            if(m_creature->IsWithinDistInMap(who, attackRadius))
+            if (m_creature->IsWithinDistInMap(who, attackRadius))
             {
                 // Check first that object is in an angle in front of this one before LoS check
-                if( m_creature->HasInArc(M_PI/2.0f, who) && m_creature->IsWithinLOSInMap(who) )
+                if (m_creature->HasInArc(M_PI/2.0f, who) && m_creature->IsWithinLOSInMap(who))
                 {
                     AttackStart(who);
                 }
@@ -249,7 +249,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
     void StartEvent()
     {
         DoScriptText(SAY_AGGRO, m_creature);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, IN_PROGRESS);
     }
 
@@ -264,7 +264,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
         }
 
         // channelers == 0 remove banish aura
-        if(AliveChannelers == 0 && m_creature->HasAura(AURA_BANISH))
+        if (AliveChannelers == 0 && m_creature->HasAura(AURA_BANISH))
         {
             // removing banish aura
             m_creature->RemoveAurasDueToSpell(AURA_BANISH);
@@ -273,21 +273,21 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
             m_creature->ApplySpellImmune(AURA_BANISH, IMMUNITY_MECHANIC, MECHANIC_BANISH, true);
 
             // changing model to bloodelf
-            m_creature->SetDisplayId( MODEL_NIGHTELF);
+            m_creature->SetDisplayId(MODEL_NIGHTELF);
 
             // and reseting equipment
             m_creature->LoadEquipment(m_creature->GetEquipmentId());
 
-            if(pInstance && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER))
+            if (pInstance && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER))
             {
                 Unit *victim = NULL;
                 victim = Unit::GetUnit(*m_creature, pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER));
-                if(victim)
+                if (victim)
                     m_creature->getThreatManager().addThreat(victim, 1);
                 StartEvent();
             }
         }
-        else if(AliveChannelers != 0 && !m_creature->HasAura(AURA_BANISH))
+        else if (AliveChannelers != 0 && !m_creature->HasAura(AURA_BANISH))
         {
             // channelers != 0 apply banish aura
             // removing Leotheras banish immune to apply AURA_BANISH
@@ -295,7 +295,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
             DoCast(m_creature, AURA_BANISH);
 
             // changing model
-            m_creature->SetDisplayId( MODEL_DEMON);
+            m_creature->SetDisplayId(MODEL_DEMON);
 
             // and removing weapons
             m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID  , 0);
@@ -308,7 +308,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
     {
         for(uint8 i=0; i<5; ++i)
         {
-            if(InnderDemon[i])
+            if (InnderDemon[i])
             {
                     //delete creature
                     Creature* pCreature = Unit::GetCreature((*m_creature), InnderDemon[i]);
@@ -327,13 +327,13 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
     {
         for(uint8 i=0; i<5; ++i)
         {
-            if(InnderDemon[i] > 0 )
+            if (InnderDemon[i] > 0)
             {
                 Creature* pUnit = Unit::GetCreature((*m_creature), InnderDemon[i]);
                 if (pUnit && pUnit->isAlive())
                 {
                     Unit* pUnit_target = Unit::GetUnit(*pUnit, CAST_AI(mob_inner_demonAI, pUnit->AI())->victimGUID);
-                    if( pUnit_target && pUnit_target->isAlive())
+                    if (pUnit_target && pUnit_target->isAlive())
                     {
                         pUnit->CastSpell(pUnit_target, SPELL_CONSUMING_MADNESS, true);
                         DoModifyThreatPercent(pUnit_target, -100);
@@ -384,7 +384,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(m_creature->HasAura(AURA_BANISH))
+        if (m_creature->HasAura(AURA_BANISH))
         return;
 
         m_creature->LoadEquipment(m_creature->GetEquipmentId());
@@ -395,18 +395,18 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
         //Return since we have no target
         if (m_creature->HasAura(AURA_BANISH) || !UpdateVictim())
         {
-            if(BanishTimer<diff)
+            if (BanishTimer<diff)
             {
                 CheckBanish();//no need to check every update tick
                 BanishTimer = 1000;
             }else BanishTimer -= diff;
             return;
         }
-        if(m_creature->HasAura(SPELL_WHIRLWIND))
-            if(Whirlwind_Timer < diff)
+        if (m_creature->HasAura(SPELL_WHIRLWIND))
+            if (Whirlwind_Timer < diff)
             {
                 Unit *newTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                if(newTarget)
+                if (newTarget)
                 {
                     DoResetThreat();
                     m_creature->GetMotionMaster()->Clear();
@@ -416,10 +416,10 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
             }else Whirlwind_Timer -= diff;
 
         // reseting after changing forms and after ending whirlwind
-        if(NeedThreatReset && !m_creature->HasAura(SPELL_WHIRLWIND))
+        if (NeedThreatReset && !m_creature->HasAura(SPELL_WHIRLWIND))
         {
             // when changing forms seting timers (or when ending whirlwind - to avoid adding new variable i use Whirlwind_Timer to countdown 2s while whirlwinding)
-            if(DemonForm)
+            if (DemonForm)
                 InnerDemons_Timer = 30000;
             else
                 Whirlwind_Timer =  15000;
@@ -430,20 +430,20 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
             m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
         }
 
-        //Enrage_Timer ( 10 min )
-        if(Berserk_Timer < diff && !EnrageUsed)
+        //Enrage_Timer (10 min)
+        if (Berserk_Timer < diff && !EnrageUsed)
         {
             m_creature->InterruptNonMeleeSpells(false);
             DoCast(m_creature, SPELL_BERSERK);
             EnrageUsed = true;
         }else Berserk_Timer -= diff;
 
-        if(!DemonForm)
+        if (!DemonForm)
         {
             //Whirldind Timer
-            if(!m_creature->HasAura(SPELL_WHIRLWIND))
+            if (!m_creature->HasAura(SPELL_WHIRLWIND))
             {
-                if(Whirlwind_Timer < diff)
+                if (Whirlwind_Timer < diff)
                 {
                     DoCast(m_creature, SPELL_WHIRLWIND);
                     // while whirlwinding this variable is used to countdown target's change
@@ -453,12 +453,12 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
             }
             //Switch_Timer
 
-            if(!IsFinalForm)
-                if(SwitchToDemon_Timer < diff)
+            if (!IsFinalForm)
+                if (SwitchToDemon_Timer < diff)
                 {
                     //switch to demon form
                     m_creature->RemoveAurasDueToSpell(SPELL_WHIRLWIND,0);
-                    m_creature->SetDisplayId( MODEL_DEMON);
+                    m_creature->SetDisplayId(MODEL_DEMON);
                     DoScriptText(SAY_SWITCH_TO_DEMON, m_creature);
                     m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID  , 0);
                     m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0);
@@ -473,12 +473,12 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
             //ChaosBlast_Timer
             if (!m_creature->getVictim())
                 return;
-            if(m_creature->IsWithinDist(m_creature->getVictim(), 30))
+            if (m_creature->IsWithinDist(m_creature->getVictim(), 30))
                 m_creature->StopMoving();
-            if(ChaosBlast_Timer < diff)
+            if (ChaosBlast_Timer < diff)
             {
                 // will cast only when in range of spell
-                if(m_creature->IsWithinDist(m_creature->getVictim(), 30))
+                if (m_creature->IsWithinDist(m_creature->getVictim(), 30))
                 {
                     //m_creature->CastSpell(m_creature->getVictim(), SPELL_CHAOS_BLAST, true);
                     int damage = 100;
@@ -487,25 +487,25 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
                 ChaosBlast_Timer = 3000;
             }else ChaosBlast_Timer -= diff;
             //Summon Inner Demon
-            if(InnerDemons_Timer < diff)
+            if (InnerDemons_Timer < diff)
             {
                 std::list<HostilReference *>& ThreatList = m_creature->getThreatManager().getThreatList();
                 std::vector<Unit *> TargetList;
                 for(std::list<HostilReference *>::iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr)
                 {
                     Unit *tempTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
-                    if(tempTarget && tempTarget->GetTypeId() == TYPEID_PLAYER && tempTarget->GetGUID() != m_creature->getVictim()->GetGUID() && TargetList.size()<5)
-                        TargetList.push_back( tempTarget );
+                    if (tempTarget && tempTarget->GetTypeId() == TYPEID_PLAYER && tempTarget->GetGUID() != m_creature->getVictim()->GetGUID() && TargetList.size()<5)
+                        TargetList.push_back(tempTarget);
                 }
                 SpellEntry *spell = GET_SPELL(SPELL_INSIDIOUS_WHISPER);
                 for(std::vector<Unit *>::iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr)
                 {
-                    if( (*itr) && (*itr)->isAlive() )
+                    if ((*itr) && (*itr)->isAlive())
                     {
                         Creature * demon = m_creature->SummonCreature(INNER_DEMON_ID, (*itr)->GetPositionX()+10, (*itr)->GetPositionY()+10, (*itr)->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                        if(demon)
+                        if (demon)
                         {
-                            demon->AI()->AttackStart( (*itr) );
+                            demon->AI()->AttackStart((*itr));
                             CAST_AI(mob_inner_demonAI, demon->AI())->victimGUID = (*itr)->GetGUID();
 
                             uint8 eff_mask=0;
@@ -516,7 +516,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
                                 eff_mask|=1<<i;
                             }
                             (*itr)->AddAura(new Aura(spell, eff_mask, NULL, (*itr), (*itr)));
-                            if( InnderDemon_Count > 4 ) InnderDemon_Count = 0;
+                            if (InnderDemon_Count > 4) InnderDemon_Count = 0;
 
                             //Safe storing of creatures
                             InnderDemon[InnderDemon_Count] = demon->GetGUID();
@@ -532,10 +532,10 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
             }else InnerDemons_Timer -= diff;
 
             //Switch_Timer
-            if(SwitchToHuman_Timer < diff)
+            if (SwitchToHuman_Timer < diff)
             {
                 //switch to nightelf form
-                m_creature->SetDisplayId( MODEL_NIGHTELF);
+                m_creature->SetDisplayId(MODEL_NIGHTELF);
                 m_creature->LoadEquipment(m_creature->GetEquipmentId());
 
                 CastConsumingMadness();
@@ -555,7 +555,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
             DespawnDemon();
             Creature *Copy = NULL;
             Copy = DoSpawnCreature(DEMON_FORM, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 6000);
-            if(Copy)
+            if (Copy)
              {
                  Demon = Copy->GetGUID();
                 if (m_creature->getVictim())
@@ -566,7 +566,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
             DemonForm = false;
 
             DoScriptText(SAY_FINAL_FORM, m_creature);
-            m_creature->SetDisplayId( MODEL_NIGHTELF);
+            m_creature->SetDisplayId(MODEL_NIGHTELF);
             m_creature->LoadEquipment(m_creature->GetEquipmentId());
         }
     }
@@ -618,16 +618,16 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blind_demonformAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
         //ChaosBlast_Timer
-        if(m_creature->IsWithinDist(m_creature->getVictim(), 30))
+        if (m_creature->IsWithinDist(m_creature->getVictim(), 30))
             m_creature->StopMoving();
 
-        if(ChaosBlast_Timer < diff)
+        if (ChaosBlast_Timer < diff)
          {
             // will cast only when in range od spell
-            if(m_creature->IsWithinDist(m_creature->getVictim(), 30))
+            if (m_creature->IsWithinDist(m_creature->getVictim(), 30))
             {
                 //m_creature->CastSpell(m_creature->getVictim(),SPELL_CHAOS_BLAST,true);
                 int damage = 100;
@@ -662,11 +662,11 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI
         Mindblast_Timer  = 3000 + rand()%5000;
         Earthshock_Timer = 5000 + rand()%5000;
 
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, 0);
             Creature *leotheras = Unit::GetCreature(*m_creature, leotherasGUID);
-            if(leotheras && leotheras->isAlive())
+            if (leotheras && leotheras->isAlive())
                 CAST_AI(boss_leotheras_the_blindAI, leotheras->AI())->CheckChannelers(false);
         }
     }
@@ -674,7 +674,7 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI
     void EnterCombat(Unit *who)
     {
         m_creature->InterruptNonMeleeSpells(false);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, who->GetGUID());
     }
 
@@ -686,12 +686,12 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI
 
     void CastChanneling()
     {
-        if(!m_creature->isInCombat() && !m_creature->m_currentSpells[CURRENT_CHANNELED_SPELL])
+        if (!m_creature->isInCombat() && !m_creature->m_currentSpells[CURRENT_CHANNELED_SPELL])
         {
-            if(leotherasGUID)
+            if (leotherasGUID)
             {
                 Creature *leotheras = Unit::GetCreature(*m_creature, leotherasGUID);
-                if(leotheras && leotheras->isAlive())
+                if (leotheras && leotheras->isAlive())
                     DoCast(leotheras, BANISH_BEAM);
             }
         }
@@ -699,56 +699,56 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(pInstance)
+        if (pInstance)
         {
-            if(!leotherasGUID)
+            if (!leotherasGUID)
                 leotherasGUID = pInstance->GetData64(DATA_LEOTHERAS);
 
-            if(!m_creature->isInCombat() && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER))
+            if (!m_creature->isInCombat() && pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER))
             {
                 Unit *victim = NULL;
                 victim = Unit::GetUnit(*m_creature, pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER));
-                if(victim)
+                if (victim)
                     AttackStart(victim);
             }
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
         {
             CastChanneling();
             return;
         }
 
-        if(pInstance && !pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER))
+        if (pInstance && !pInstance->GetData64(DATA_LEOTHERAS_EVENT_STARTER))
         {
             EnterEvadeMode();
             return;
         }
 
-        if(Mindblast_Timer < diff)
+        if (Mindblast_Timer < diff)
         {
             Unit* target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM,0);
 
-            if ( target )DoCast(target, SPELL_MINDBLAST);
+            if (target)DoCast(target, SPELL_MINDBLAST);
 
             Mindblast_Timer = 10000 + rand()%5000;
         }else Mindblast_Timer -= diff;
 
-        if(Earthshock_Timer < diff)
+        if (Earthshock_Timer < diff)
         {
-            Map *map = m_creature->GetMap();
-            Map::PlayerList const &PlayerList = map->GetPlayers();
+            Map* pMap = m_creature->GetMap();
+            Map::PlayerList const &PlayerList = pMap->GetPlayers();
             for(Map::PlayerList::const_iterator itr = PlayerList.begin();itr != PlayerList.end(); ++itr)
             {
                 if (Player* i_pl = itr->getSource())
                 {
                     bool isCasting = false;
                     for(uint8 i = 0; i < CURRENT_MAX_SPELL; ++i)
-                        if(i_pl->m_currentSpells[i])
+                        if (i_pl->m_currentSpells[i])
                             isCasting = true;
 
-                    if(isCasting)
+                    if (isCasting)
                     {
                         DoCast(i_pl, SPELL_EARTHSHOCK);
                         break;
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
index 1bae9af9109..4b8c2169a93 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
@@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
     {
         pInstance = c->GetInstanceData();
         SpellEntry *TempSpell = GET_SPELL(SPELL_SPOUT_ANIM);
-        if(TempSpell)
+        if (TempSpell)
         {
             TempSpell->Effect[0] = 0;//remove all spell effect, only anim is needed
             TempSpell->Effect[1] = 0;
@@ -126,10 +126,10 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
 
         Summons.DespawnAll();
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_THELURKERBELOWEVENT, NOT_STARTED);
 
-        /*if(pInstance->GetData(DATA_STRANGE_POOL) != DONE)
+        /*if (pInstance->GetData(DATA_STRANGE_POOL) != DONE)
         {
             m_creature->SetReactState(REACT_PASSIVE);
             m_creature->SetVisibility(VISIBILITY_OFF);
@@ -154,7 +154,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
 
      void EnterCombat(Unit *who)
      {
-         if(pInstance)
+         if (pInstance)
             pInstance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS);
 
          if (!who || m_creature->getVictim())
@@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
 
      void JustDied(Unit* Killer)
      {
-         if(pInstance)
+         if (pInstance)
             pInstance->SetData(DATA_THELURKERBELOWEVENT, DONE);
 
          Summons.DespawnAll();
@@ -203,10 +203,10 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
              break;
          }
 
-         if(!Spout)
+         if (!Spout)
              return;
 
-         if(RotTimer<diff)//end rotate
+         if (RotTimer<diff)//end rotate
          {
              RotType = NOROTATE;//set norotate state
              RotTimer=20000;
@@ -215,20 +215,20 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
              return;
          }else RotTimer-=diff;
 
-         if(SpoutAnimTimer<diff)
+         if (SpoutAnimTimer<diff)
          {
              DoCast(m_creature,SPELL_SPOUT_ANIM,true);
              SpoutAnimTimer = 1000;
          }else SpoutAnimTimer-=diff;
 
-         Map *map = m_creature->GetMap();
-         if (map->IsDungeon() && pInstance->GetData(DATA_THELURKERBELOWEVENT) == IN_PROGRESS)
+         Map* pMap = m_creature->GetMap();
+         if (pMap->IsDungeon() && pInstance->GetData(DATA_THELURKERBELOWEVENT) == IN_PROGRESS)
          {
-             Map::PlayerList const &PlayerList = map->GetPlayers();
+             Map::PlayerList const &PlayerList = pMap->GetPlayers();
              for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
              {
                  Player *target = i->getSource();
-                 if(target && target->isAlive() && m_creature->HasInArc((double)diff/20000*(double)M_PI*2,target) && m_creature->IsWithinDist(target, SPOUT_DIST) && !target->IsInWater())
+                 if (target && target->isAlive() && m_creature->HasInArc((double)diff/20000*(double)M_PI*2,target) && m_creature->IsWithinDist(target, SPOUT_DIST) && !target->IsInWater())
                      DoCast(target,SPELL_SPOUT,true);//only knock back palyers in arc, in 100yards, not in water
              }
          }
@@ -243,7 +243,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
          }
          RotTimer=20000;
 
-         if(victim)
+         if (victim)
              SpoutAngle = m_creature->GetAngle(victim);
 
          m_creature->MonsterTextEmote(EMOTE_SPOUT,0,true);
@@ -253,14 +253,14 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
      void UpdateAI(const uint32 diff)
      {
          //Return since we have no target
-         if (!UpdateVictim() /*|| !m_creature->getVictim()*/ )//rotate resets target
+         if (!UpdateVictim() /*|| !m_creature->getVictim()*/)//rotate resets target
              return;
 
           //Check if players in water and if in water cast spell
-         Map *map = m_creature->GetMap();
-         if (map->IsDungeon() && pInstance->GetData(DATA_THELURKERBELOWEVENT) == IN_PROGRESS)
+         Map* pMap = m_creature->GetMap();
+         if (pMap->IsDungeon() && pInstance->GetData(DATA_THELURKERBELOWEVENT) == IN_PROGRESS)
          {
-             Map::PlayerList const &PlayerList = map->GetPlayers();
+             Map::PlayerList const &PlayerList = pMap->GetPlayers();
 
              if (PlayerList.isEmpty())
                  return;
@@ -269,15 +269,15 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
              {
                  if (i->getSource()->isAlive() && i->getSource()->IsInWater() && !i->getSource()->HasAura(SPELL_SCALDINGWATER))
                      i->getSource()->CastSpell(i->getSource(), SPELL_SCALDINGWATER, true);
-                 else if(!i->getSource()->IsInWater())
+                 else if (!i->getSource()->IsInWater())
                      i->getSource()->RemoveAurasDueToSpell(SPELL_SCALDINGWATER);
              }
          }
 
          Rotate(diff);//always check rotate things
-         if(!Submerged)
+         if (!Submerged)
          {
-             if(PhaseTimer < diff)
+             if (PhaseTimer < diff)
              {
                  m_creature->InterruptNonMeleeSpells(false);
                  DoCast(m_creature,SPELL_SUBMERGE);
@@ -286,11 +286,11 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
              }else PhaseTimer-=diff;
          }
 
-         if(!Submerged && RotType == NOROTATE)//is not spouting and not submerged
+         if (!Submerged && RotType == NOROTATE)//is not spouting and not submerged
          {
-             if(SpoutTimer < diff)
+             if (SpoutTimer < diff)
              {
-                 if(m_creature->getVictim() && RotType == NOROTATE)
+                 if (m_creature->getVictim() && RotType == NOROTATE)
                      StartRotate(m_creature->getVictim());//start spout and random rotate
 
                  SpoutTimer= 35000;
@@ -298,50 +298,50 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
              }else SpoutTimer -= diff;
 
              //Whirl directly after a Spout and at random times
-             if(WhirlTimer < diff)
+             if (WhirlTimer < diff)
              {
                  WhirlTimer = rand()%5000 + 15000;
                  DoCast(m_creature,SPELL_WHIRL);
                  WaterboltTimer += 5000;//add 5secs to waterbolt timer, to add some time to run back to boss
              }else WhirlTimer -= diff;
 
-             if(GeyserTimer < diff)
+             if (GeyserTimer < diff)
              {
                  Unit* target = NULL;
                  target = SelectUnit(SELECT_TARGET_RANDOM,1);
 
-                 if(target)
+                 if (target)
                     DoCast(target,SPELL_GEYSER,true);
                  else
                      target = SelectUnit(SELECT_TARGET_RANDOM,0);
-                 if(target)
+                 if (target)
                      DoCast(target,SPELL_GEYSER,true);
 
                  GeyserTimer = rand()%5000 + 15000;
              }else GeyserTimer -= diff;
 
-             if(WaterboltTimer < diff)
+             if (WaterboltTimer < diff)
              {
                  Unit* target = SelectTarget(SELECT_TARGET_NEAREST,0,14,true);
-                 if(!target)
+                 if (!target)
                  {
                      target = SelectUnit(SELECT_TARGET_RANDOM,0);
-                     if(target)
+                     if (target)
                          DoCast(target,SPELL_WATERBOLT);
                  }
                  WaterboltTimer = 3000;
              }else WaterboltTimer -= diff;
 
-             if (!UpdateVictim() )
+             if (!UpdateVictim())
                 return;
 
              DoMeleeAttackIfReady();
 
-         }else if(!Submerged)
+         }else if (!Submerged)
              return;
-         else if(Submerged)//phase 2, submerged
+         else if (Submerged)//phase 2, submerged
          {
-             if(PhaseTimer < diff)
+             if (PhaseTimer < diff)
              {
                  Submerged = false;
                  m_creature->InterruptNonMeleeSpells(false);//shouldn't be any
@@ -357,21 +357,21 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
                  return;
              }else PhaseTimer-=diff;
 
-             if(!m_creature->isInCombat())
+             if (!m_creature->isInCombat())
                  DoZoneInCombat();
 
-             if(!Spawned)
+             if (!Spawned)
              {
                  m_creature->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                  //spawn adds
                  for (uint8 i = 0; i < 9; ++i)
                  {
                      Creature* Summoned;
-                     if(i < 7)
+                     if (i < 7)
                          Summoned = m_creature->SummonCreature(MOB_COILFANG_AMBUSHER,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
                      else Summoned = m_creature->SummonCreature(MOB_COILFANG_GUARDIAN,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
 
-                     if(Summoned)
+                     if (Summoned)
                         Summons.Summon(Summoned);
                      Spawned = true;
                  }
@@ -404,7 +404,7 @@ struct TRINITY_DLL_DECL mob_coilfang_ambusherAI : public Scripted_NoMovementAI
     mob_coilfang_ambusherAI(Creature *c) : Scripted_NoMovementAI(c)
     {
         SpellEntry *TempSpell = GET_SPELL(SPELL_SHOOT);
-        if(TempSpell)
+        if (TempSpell)
             TempSpell->Effect[0] = 2;//change spell effect from weapon % dmg to simple phisical dmg
     }
 
@@ -435,21 +435,21 @@ struct TRINITY_DLL_DECL mob_coilfang_ambusherAI : public Scripted_NoMovementAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(MultiShotTimer < diff)
+        if (MultiShotTimer < diff)
         {
-            if(m_creature->getVictim())
+            if (m_creature->getVictim())
                 DoCast(m_creature->getVictim(), SPELL_SPREAD_SHOT, true);
 
             MultiShotTimer = 10000;
             ShootBowTimer += 1500;//add global cooldown
         }else MultiShotTimer -= diff;
 
-        if(ShootBowTimer < diff)
+        if (ShootBowTimer < diff)
         {
             Unit* target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM, 0);
             int bp0 = 1100;
-            if(target)
+            if (target)
                 m_creature->CastCustomSpell(target,SPELL_SHOOT,&bp0,NULL,NULL,true);
             ShootBowTimer = 4000;
             MultiShotTimer += 1500;//add global cooldown
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
index fef44791a0a..d248d9dd658 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
@@ -168,21 +168,21 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
         StartEvent();
     }
 
-    void ApplyWateryGrave(Unit *player, uint8 i)
+    void ApplyWateryGrave(Unit* pPlayer, uint8 i)
     {
         switch(i)
         {
-        case 0: player->CastSpell(player, SPELL_WATERY_GRAVE_1, true); break;
-        case 1: player->CastSpell(player, SPELL_WATERY_GRAVE_2, true); break;
-        case 2: player->CastSpell(player, SPELL_WATERY_GRAVE_3, true); break;
-        case 3: player->CastSpell(player, SPELL_WATERY_GRAVE_4, true); break;
+        case 0: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_1, true); break;
+        case 1: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_2, true); break;
+        case 2: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_3, true); break;
+        case 3: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_4, true); break;
         }
     }
 
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Earthquake_Timer
@@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
                 {
                     Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
                     Creature* Murloc = m_creature->SummonCreature(MurlocCords[i][0],MurlocCords[i][1],MurlocCords[i][2],MurlocCords[i][3],MurlocCords[i][4], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
-                    if(target && Murloc)
+                    if (target && Murloc)
                         Murloc->AI()->AttackStart(target);
                 }
                 DoScriptText(EMOTE_EARTHQUAKE, m_creature);
@@ -236,12 +236,12 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
                 {
                     counter = 0;
                     do{target = SelectTarget(SELECT_TARGET_RANDOM, 1, 50, true);    //target players only
-                    if(counter < Playercount)
+                    if (counter < Playercount)
                         break;
-                    if(target) itr = list.find(target->GetGUID());
+                    if (target) itr = list.find(target->GetGUID());
                     counter++;
                     }while(itr != list.end());
-                    if(target){list.insert(target->GetGUID());
+                    if (target){list.insert(target->GetGUID());
                     ApplyWateryGrave(target, i);
                     }
                 }
@@ -273,12 +273,12 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
                 {
                     counter = 0;
                     do {globuletarget = SelectTarget(SELECT_TARGET_RANDOM, 0,50,true);
-                    if(globuletarget) itr = globulelist.find(globuletarget->GetGUID());
+                    if (globuletarget) itr = globulelist.find(globuletarget->GetGUID());
                     if (counter > Playercount)
                         break;
                     counter++;
                     } while (itr != globulelist.end());
-                    if(globuletarget)globulelist.insert(globuletarget->GetGUID());
+                    if (globuletarget)globulelist.insert(globuletarget->GetGUID());
                     globuletarget->CastSpell(globuletarget, globulespell[g], true);
                 }
                 DoScriptText(EMOTE_WATERY_GLOBULES, m_creature);
@@ -326,7 +326,7 @@ struct TRINITY_DLL_DECL mob_water_globuleAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (Check_Timer < diff)
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
index 5e7e89bc1cf..59d681919ce 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
@@ -35,11 +35,11 @@ EndScriptData */
 5 - Lady Vashj Event
 */
 
-bool GOHello_go_bridge_console(Player *player, GameObject* go)
+bool GOHello_go_bridge_console(Player* pPlayer, GameObject* go)
 {
     ScriptedInstance* pInstance = go->GetInstanceData();
 
-    if(!pInstance)
+    if (!pInstance)
         return false;
 
     if (pInstance)
@@ -50,7 +50,7 @@ bool GOHello_go_bridge_console(Player *player, GameObject* go)
 
 struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
 {
-    instance_serpentshrine_cavern(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_serpentshrine_cavern(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint64 LurkerBelow;
     uint64 Sharkkis;
@@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS) return true;
+            if (Encounters[i] == IN_PROGRESS) return true;
 
         return false;
     }
@@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
             break;
             case 184956:
                 StrangePool = go->GetGUID();
-                if(go->isActiveObject())
+                if (go->isActiveObject())
                     SetData(DATA_STRANGE_POOL, DONE);
         }
     }
@@ -149,9 +149,9 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
 
     void SetData64(uint32 type, uint64 data)
     {
-        if(type == DATA_KARATHRESSEVENT_STARTER)
+        if (type == DATA_KARATHRESSEVENT_STARTER)
             KarathressEvent_Starter = data;
-        if(type == DATA_LEOTHERAS_EVENT_STARTER)
+        if (type == DATA_LEOTHERAS_EVENT_STARTER)
             LeotherasEventStarter = data;
     }
 
@@ -178,7 +178,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
         {
         case DATA_STRANGE_POOL: StrangePool = data;
         case DATA_CONTROL_CONSOLE:
-            if(data == DONE)
+            if (data == DONE)
             {
                 HandleGameObject(BridgePart[0], true);
                 HandleGameObject(BridgePart[0], true);
@@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
         case DATA_MOROGRIMTIDEWALKEREVENT:  Encounters[4] = data;   break;
             //Lady Vashj
         case DATA_LADYVASHJEVENT:
-            if(data == NOT_STARTED)
+            if (data == NOT_STARTED)
             {
                 ShieldGeneratorDeactivated[0] = false;
                 ShieldGeneratorDeactivated[1] = false;
@@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
         case DATA_SHIELDGENERATOR4:ShieldGeneratorDeactivated[3] = (data) ? true : false;   break;
         }
 
-        if(data == DONE)
+        if (data == DONE)
             SaveToDB();
     }
 
@@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
             case DATA_SHIELDGENERATOR3:         return ShieldGeneratorDeactivated[2];
             case DATA_SHIELDGENERATOR4:         return ShieldGeneratorDeactivated[3];
             case DATA_CANSTARTPHASE3:
-                if(ShieldGeneratorDeactivated[0] && ShieldGeneratorDeactivated[1] && ShieldGeneratorDeactivated[2] && ShieldGeneratorDeactivated[3])return 1;break;
+                if (ShieldGeneratorDeactivated[0] && ShieldGeneratorDeactivated[1] && ShieldGeneratorDeactivated[2] && ShieldGeneratorDeactivated[3])return 1;break;
         }
         return 0;
     }
@@ -238,7 +238,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
             << Encounters[3] << " " << Encounters[4] << " " << Encounters[5];
         char* out = new char[stream.str().length() + 1];
         strcpy(out, stream.str().c_str());
-        if(out)
+        if (out)
         {
             OUT_SAVE_INST_DATA_COMPLETE;
             return out;
@@ -248,7 +248,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
 
     void Load(const char* in)
     {
-        if(!in)
+        if (!in)
         {
             OUT_LOAD_INST_DATA_FAIL;
             return;
@@ -258,15 +258,15 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
         stream >> Encounters[0] >> Encounters[1] >> Encounters[2] >> Encounters[3]
         >> Encounters[4] >> Encounters[5];
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS)                // Do not load an encounter as "In Progress" - reset it instead.
+            if (Encounters[i] == IN_PROGRESS)                // Do not load an encounter as "In Progress" - reset it instead.
                 Encounters[i] = NOT_STARTED;
         OUT_LOAD_INST_DATA_COMPLETE;
     }
 };
 
-InstanceData* GetInstanceData_instance_serpentshrine_cavern(Map* map)
+InstanceData* GetInstanceData_instance_serpentshrine_cavern(Map* pMap)
 {
-    return new instance_serpentshrine_cavern(map);
+    return new instance_serpentshrine_cavern(pMap);
 }
 
 void AddSC_instance_serpentshrine_cavern()
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
index 5a73a93f386..49209dc7193 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
@@ -152,7 +152,7 @@ struct TRINITY_DLL_DECL boss_warlord_kalithreshAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (Rage_Timer < diff)
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
index 087a7cf701a..45c7c47988b 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
@@ -36,7 +36,7 @@ EndScriptData */
 3 - Warlord Kalithresh Event
 */
 
-bool GOHello_go_main_chambers_access_panel(Player *player, GameObject* _GO)
+bool GOHello_go_main_chambers_access_panel(Player* pPlayer, GameObject* _GO)
 {
     ScriptedInstance* pInstance = _GO->GetInstanceData();
 
@@ -54,7 +54,7 @@ bool GOHello_go_main_chambers_access_panel(Player *player, GameObject* _GO)
 
 struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance
 {
-    instance_steam_vault(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_steam_vault(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounter[ENCOUNTERS];
 
@@ -144,7 +144,7 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance
                 break;
         }
 
-        if(data == DONE || data == SPECIAL)
+        if (data == DONE || data == SPECIAL)
             SaveToDB();
     }
 
@@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance
         stream << Encounter[0] << " " << Encounter[1] << " " << Encounter[2] << " " << Encounter[3];
         char* out = new char[stream.str().length() + 1];
         strcpy(out, stream.str().c_str());
-        if(out)
+        if (out)
         {
             OUT_SAVE_INST_DATA_COMPLETE;
             return out;
@@ -195,7 +195,7 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance
 
     void Load(const char* in)
     {
-        if(!in)
+        if (!in)
         {
             OUT_LOAD_INST_DATA_FAIL;
             return;
@@ -204,15 +204,15 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance
         std::istringstream stream(in);
         stream >> Encounter[0] >> Encounter[1] >> Encounter[2] >> Encounter[3];
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounter[i] == IN_PROGRESS)
+            if (Encounter[i] == IN_PROGRESS)
                 Encounter[i] = NOT_STARTED;
         OUT_LOAD_INST_DATA_COMPLETE;
     }
 };
 
-InstanceData* GetInstanceData_instance_steam_vault(Map* map)
+InstanceData* GetInstanceData_instance_steam_vault(Map* pMap)
 {
-    return new instance_steam_vault(map);
+    return new instance_steam_vault(pMap);
 }
 
 void AddSC_instance_steam_vault()
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp
index a0a0b2a2cd1..8c05801ffd0 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp
@@ -54,18 +54,18 @@ struct TRINITY_DLL_DECL boss_hungarfenAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if( (m_creature->GetHealth()*100) / m_creature->GetMaxHealth() <= 20 )
+        if ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() <= 20)
         {
-            if( !Root )
+            if (!Root)
             {
                 DoCast(m_creature,SPELL_FOUL_SPORES);
                 Root = true;
             }
         }
 
-        if( Mushroom_Timer < diff )
+        if (Mushroom_Timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 m_creature->SummonCreature(17990, target->GetPositionX()+(rand()%8), target->GetPositionY()+(rand()%8), target->GetPositionZ(), (rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000);
             else
                 m_creature->SummonCreature(17990, m_creature->GetPositionX()+(rand()%8), m_creature->GetPositionY()+(rand()%8), m_creature->GetPositionZ(), (rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000);
@@ -73,9 +73,9 @@ struct TRINITY_DLL_DECL boss_hungarfenAI : public ScriptedAI
             Mushroom_Timer = 10000;
         }else Mushroom_Timer -= diff;
 
-        if( AcidGeyser_Timer < diff )
+        if (AcidGeyser_Timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_ACID_GEYSER);
             AcidGeyser_Timer = 10000+rand()%7500;
         }else AcidGeyser_Timer -= diff;
@@ -118,16 +118,16 @@ struct TRINITY_DLL_DECL mob_underbog_mushroomAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if( Stop )
+        if (Stop)
             return;
 
-        if( Grow_Timer <= diff )
+        if (Grow_Timer <= diff)
         {
             DoCast(m_creature,SPELL_GROW);
             Grow_Timer = 3000;
         }else Grow_Timer -= diff;
 
-        if( Shrink_Timer <= diff )
+        if (Shrink_Timer <= diff)
         {
             m_creature->RemoveAurasDueToSpell(SPELL_GROW);
             Stop = true;
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
index 69d2c40318a..adcaac75a4e 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
@@ -67,13 +67,13 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI
 
     void JustSummoned(Creature *summon)
     {
-        if(summon && summon->GetEntry() == ENTRY_SPORE_STRIDER)
+        if (summon && summon->GetEntry() == ENTRY_SPORE_STRIDER)
         {
             Striders.push_back(summon->GetGUID());
-            if(Unit *target = SelectUnit(SELECT_TARGET_RANDOM,1))
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,1))
                 summon->AI()->AttackStart(target);
             else
-                if(m_creature->getVictim())
+                if (m_creature->getVictim())
                     summon->AI()->AttackStart(m_creature->getVictim());
         }
     }
@@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI
     void JustDied(Unit *who)
     {
         for(std::list<uint64>::iterator i = Striders.begin(); i != Striders.end(); ++i)
-            if(Creature *strider = Unit::GetCreature(*m_creature, *i))
+            if (Creature *strider = Unit::GetCreature(*m_creature, *i))
             {
                 strider->SetLootRecipient(NULL);
                 strider->DealDamage(strider,strider->GetMaxHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
@@ -95,11 +95,11 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI
             return;
 
         // Evade if too far
-        if(check_Timer < diff)
+        if (check_Timer < diff)
         {
             float x,y,z,o;
             m_creature->GetHomePosition(x,y,z,o);
-            if(!m_creature->IsWithinDist3d(x,y,z, 60))
+            if (!m_creature->IsWithinDist3d(x,y,z, 60))
             {
                 EnterEvadeMode();
                 return;
@@ -108,25 +108,25 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI
         }else check_Timer -= diff;
 
         // Spore Striders
-        if(HeroicMode && SporeStriders_Timer < diff)
+        if (HeroicMode && SporeStriders_Timer < diff)
         {
             DoCast(m_creature,SPELL_SUMMON_SPORE_STRIDER);
             SporeStriders_Timer = 10000+rand()%5000;
         }else SporeStriders_Timer -= diff;
 
         // Levitate
-        if(LevitatedTarget)
+        if (LevitatedTarget)
         {
-            if(LevitatedTarget_Timer < diff)
+            if (LevitatedTarget_Timer < diff)
             {
-                if(Unit* target = Unit::GetUnit(*m_creature, LevitatedTarget))
+                if (Unit* target = Unit::GetUnit(*m_creature, LevitatedTarget))
                 {
-                    if(!target->HasAura(SPELL_LEVITATE))
+                    if (!target->HasAura(SPELL_LEVITATE))
                     {
                         LevitatedTarget = 0;
                         return;
                     }
-                    if(InAir)
+                    if (InAir)
                     {
                         target->AddAura(SPELL_SUSPENSION, target);
                         LevitatedTarget = 0;
@@ -142,9 +142,9 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI
                     LevitatedTarget = 0;
             }else LevitatedTarget_Timer -= diff;
         }
-        if(Levitate_Timer < diff)
+        if (Levitate_Timer < diff)
         {
-            if(Unit *target = SelectUnit(SELECT_TARGET_RANDOM,1))
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,1))
             {
                 DoCast(target, SPELL_LEVITATE);
                 LevitatedTarget = target->GetGUID();
@@ -155,17 +155,17 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI
         }else Levitate_Timer -= diff;
 
         // Chain Lightning
-        if(ChainLightning_Timer < diff)
+        if (ChainLightning_Timer < diff)
         {
-            if(Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target, SPELL_CHAIN_LIGHTNING);
             ChainLightning_Timer = 7000;
         }else ChainLightning_Timer -= diff;
 
         // Static Charge
-        if(StaticCharge_Timer < diff)
+        if (StaticCharge_Timer < diff)
         {
-            if(Unit *target = SelectTarget(SELECT_TARGET_RANDOM,0,30,true))
+            if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM,0,30,true))
                 DoCast(target, SPELL_STATIC_CHARGE);
             StaticCharge_Timer = 10000;
         }else StaticCharge_Timer -= diff;
diff --git a/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp b/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp
index 83e0ea4a98f..12a30463eed 100644
--- a/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp
+++ b/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp
@@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL npc_prospector_remtravelAI : public npc_escortAI
     {
         Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if(!pPlayer)
+        if (!pPlayer)
             return;
 
         switch(i)
@@ -127,7 +127,7 @@ struct TRINITY_DLL_DECL npc_prospector_remtravelAI : public npc_escortAI
 
     void EnterCombat(Unit* who)
     {
-        if(rand()%2)
+        if (rand()%2)
             DoScriptText(SAY_REM_AGGRO, me, who);
     }
 
@@ -154,7 +154,7 @@ CreatureAI* GetAI_npc_prospector_remtravel(Creature* pCreature)
 
 bool QuestAccept_npc_prospector_remtravel(Player* pPlayer, Creature* pCreature, const Quest* pQuest)
 {
-    if(pQuest->GetQuestId() == QUEST_ABSENT_MINDED_PT2)
+    if (pQuest->GetQuestId() == QUEST_ABSENT_MINDED_PT2)
     {
         CAST_AI(npc_escortAI, pCreature->AI())->Start(false, false, pPlayer->GetGUID());
         pCreature->setFaction(FACTION_ESCORTEE);
@@ -196,7 +196,7 @@ struct TRINITY_DLL_DECL npc_threshwackonatorAI : public ScriptedAI
     {
         CheckPlayerTimer = 2500;
 
-        if(!PlayerGUID)
+        if (!PlayerGUID)
         {
             me->setFaction(Faction);
             me->SetUInt32Value(UNIT_NPC_FLAGS, NpcFlags);
@@ -205,9 +205,9 @@ struct TRINITY_DLL_DECL npc_threshwackonatorAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit* who)
     {
-        if(who->GetEntry() == NPC_GELKAK)
+        if (who->GetEntry() == NPC_GELKAK)
         {
-            if(PlayerGUID && me->IsWithinDistInMap(who, 10.0f))
+            if (PlayerGUID && me->IsWithinDistInMap(who, 10.0f))
             {
                 DoScriptText(SAY_AT_CLOSE, who);
                 DoAtEnd();
@@ -224,9 +224,9 @@ struct TRINITY_DLL_DECL npc_threshwackonatorAI : public ScriptedAI
         me->CombatStop(true);
         me->LoadCreaturesAddon();
 
-        if(me->isAlive())
+        if (me->isAlive())
         {
-            if(Player* pPlayer = Unit::GetPlayer(PlayerGUID))
+            if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
                 me->GetMotionMaster()->MoveFollow(pPlayer, PET_FOLLOW_DIST, m_creature->GetFollowAngle());
             else
             {
@@ -245,7 +245,7 @@ struct TRINITY_DLL_DECL npc_threshwackonatorAI : public ScriptedAI
         PlayerGUID = Starter;
         me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
 
-        if(Player* pPlayer = Unit::GetPlayer(PlayerGUID))
+        if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
             me->GetMotionMaster()->MoveFollow(pPlayer, PET_FOLLOW_DIST, m_creature->GetFollowAngle());
 
         DoScriptText(EMOTE_START, me);
@@ -255,7 +255,7 @@ struct TRINITY_DLL_DECL npc_threshwackonatorAI : public ScriptedAI
     {
         me->setFaction(FACTION_HOSTILE);
 
-        if(Player* pHolder = Unit::GetPlayer(PlayerGUID))
+        if (Player* pHolder = Unit::GetPlayer(PlayerGUID))
             me->AI()->AttackStart(pHolder);
 
         PlayerGUID = 0;
@@ -263,7 +263,7 @@ struct TRINITY_DLL_DECL npc_threshwackonatorAI : public ScriptedAI
 
     void JustDied(Unit* pKiller)
     {
-        if(PlayerGUID)
+        if (PlayerGUID)
         {
             PlayerGUID = 0;
             me->GetMotionMaster()->MovementExpired();
@@ -272,17 +272,17 @@ struct TRINITY_DLL_DECL npc_threshwackonatorAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(PlayerGUID)
+        if (PlayerGUID)
         {
-            if(!me->isInCombat())
+            if (!me->isInCombat())
             {
-                if(CheckPlayerTimer < diff)
+                if (CheckPlayerTimer < diff)
                 {
                     CheckPlayerTimer = 5000;
 
                     Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-                    if(pPlayer && !pPlayer->isAlive())
+                    if (pPlayer && !pPlayer->isAlive())
                     {
                         PlayerGUID = 0;
                         EnterEvadeMode();
@@ -292,7 +292,7 @@ struct TRINITY_DLL_DECL npc_threshwackonatorAI : public ScriptedAI
             }
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
@@ -306,7 +306,7 @@ CreatureAI* GetAI_npc_threshwackonator(Creature* pCreature)
 
 bool GossipHello_npc_threshwackonator(Player* pPlayer, Creature* pCreature)
 {
-    if(pPlayer->GetQuestStatus(QUEST_GYROMAST_REV) == QUEST_STATUS_INCOMPLETE)
+    if (pPlayer->GetQuestStatus(QUEST_GYROMAST_REV) == QUEST_STATUS_INCOMPLETE)
         pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_INSERT_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
     pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID());
@@ -315,7 +315,7 @@ bool GossipHello_npc_threshwackonator(Player* pPlayer, Creature* pCreature)
 
 bool GossipSelect_npc_threshwackonator(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
 {
-    if(action == GOSSIP_ACTION_INFO_DEF+1)
+    if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
         CAST_AI(npc_threshwackonatorAI, pCreature->AI())->DoStart(pPlayer->GetGUID());
         pPlayer->CLOSE_GOSSIP_MENU();
diff --git a/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp b/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp
index c80f77f0f0f..8f5cf62c927 100644
--- a/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp
+++ b/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp
@@ -41,7 +41,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
 {
-    instance_deadmines(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_deadmines(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     GameObject* IronCladDoor;
     GameObject* DefiasCannon;
@@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
 
     virtual void Update(uint32 diff)
     {
-        if(!IronCladDoor || !DefiasCannon || !DoorLever)
+        if (!IronCladDoor || !DefiasCannon || !DoorLever)
             return;
 
         switch(State)
@@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
                 break;
             case CANNON_BLAST_INITIATED:
                 PiratesDelay_Timer = PIRATES_DELAY_TIMER;
-                if(CannonBlast_Timer<diff)
+                if (CannonBlast_Timer<diff)
                 {
                     SummonCreatures();
                     ShootCannon();
@@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
                     CannonBlast_Timer-=diff;
                 break;
             case PIRATES_ATTACK:
-                if(PiratesDelay_Timer<diff)
+                if (PiratesDelay_Timer<diff)
                 {
                     MoveCreaturesInside();
                     State = EVENT_DONE;
@@ -110,7 +110,7 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
 
     void MoveCreaturesInside()
     {
-        if(!DefiasPirate1 || !DefiasPirate2 || !DefiasCompanion)
+        if (!DefiasPirate1 || !DefiasPirate2 || !DefiasCompanion)
             return;
 
         MoveCreatureInside(DefiasPirate1);
@@ -194,30 +194,30 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
 # item_Defias_Gunpowder
 #####*/
 
-bool ItemUse_item_defias_gunpowder(Player *player, Item* _Item, SpellCastTargets const& targets)
+bool ItemUse_item_defias_gunpowder(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
 {
-    ScriptedInstance *pInstance = (player->GetInstanceData()) ? (player->GetInstanceData()) : NULL;
+    ScriptedInstance *pInstance = (pPlayer->GetInstanceData()) ? (pPlayer->GetInstanceData()) : NULL;
 
-    if(!pInstance)
+    if (!pInstance)
     {
-        player->GetSession()->SendNotification("Instance script not initialized");
+        pPlayer->GetSession()->SendNotification("Instance script not initialized");
         return true;
     }
     if (pInstance->GetData(EVENT_STATE)!= CANNON_NOT_USED)
         return false;
-    if(targets.getGOTarget() && targets.getGOTarget()->GetTypeId() == TYPEID_GAMEOBJECT &&
+    if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId() == TYPEID_GAMEOBJECT &&
        targets.getGOTarget()->GetEntry() == GO_DEFIAS_CANNON)
     {
         pInstance->SetData(EVENT_STATE, CANNON_GUNPOWDER_USED);
     }
 
-    player->DestroyItemCount(_Item->GetEntry(), 1, true);
+    pPlayer->DestroyItemCount(_Item->GetEntry(), 1, true);
     return true;
 }
 
-InstanceData* GetInstanceData_instance_deadmines(Map* map)
+InstanceData* GetInstanceData_instance_deadmines(Map* pMap)
 {
-    return new instance_deadmines(map);
+    return new instance_deadmines(pMap);
 }
 
 void AddSC_instance_deadmines()
diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp
index 3dcd3e632e8..eb420cb98a6 100644
--- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp
+++ b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_dred.cpp
@@ -32,7 +32,7 @@ struct TRINITY_DLL_DECL boss_dredAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp
index 6a12f2afc4c..4198a0542a3 100644
--- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp
+++ b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_novos.cpp
@@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_novosAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp
index b09e6f14508..84921b17f1a 100644
--- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp
+++ b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_tharon_ja.cpp
@@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp
index 74b474b0fd1..3ae5246a250 100644
--- a/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp
+++ b/src/bindings/scripts/scripts/zone/draktharon_keep/boss_trollgore.cpp
@@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL boss_trollgoreAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/draktharon_keep/instance_drak_tharon_keep.cpp b/src/bindings/scripts/scripts/zone/draktharon_keep/instance_drak_tharon_keep.cpp
index 867c576db0d..795f36eca18 100644
--- a/src/bindings/scripts/scripts/zone/draktharon_keep/instance_drak_tharon_keep.cpp
+++ b/src/bindings/scripts/scripts/zone/draktharon_keep/instance_drak_tharon_keep.cpp
@@ -3,12 +3,12 @@
 
 struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance
 {
-    instance_drak_tharon(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_drak_tharon(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 };
 
-InstanceData* GetInstanceData_instance_drak_tharon(Map* map)
+InstanceData* GetInstanceData_instance_drak_tharon(Map* pMap)
 {
-    return new instance_drak_tharon(map);
+    return new instance_drak_tharon(pMap);
 }
 
 void AddSC_instance_drak_tharon()
diff --git a/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp b/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp
index 5e33be96da0..e04ce0f10b0 100644
--- a/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp
+++ b/src/bindings/scripts/scripts/zone/dun_morogh/dun_morogh.cpp
@@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL npc_narm_faulkAI : public ScriptedAI
     {
        if (m_creature->IsStandState())
         {
-            if(lifeTimer < diff)
+            if (lifeTimer < diff)
             {
                 EnterEvadeMode();
                 return;
@@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL npc_narm_faulkAI : public ScriptedAI
 
     void SpellHit(Unit *Hitter, const SpellEntry *Spellkind)
     {
-        if(Spellkind->Id == 8593 && !spellHit)
+        if (Spellkind->Id == 8593 && !spellHit)
         {
             DoCast(m_creature,32343);
             m_creature->SetStandState(UNIT_STAND_STATE_STAND);
diff --git a/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp b/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp
index ac7c95c5f1a..688a5663993 100644
--- a/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp
+++ b/src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp
@@ -56,8 +56,8 @@ struct TRINITY_DLL_DECL mobs_risen_husk_spiritAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if( done_by->GetTypeId() == TYPEID_PLAYER )
-            if( damage >= m_creature->GetHealth() && CAST_PLR(done_by)->GetQuestStatus(11180) == QUEST_STATUS_INCOMPLETE )
+        if (done_by->GetTypeId() == TYPEID_PLAYER)
+            if (damage >= m_creature->GetHealth() && CAST_PLR(done_by)->GetQuestStatus(11180) == QUEST_STATUS_INCOMPLETE)
                 m_creature->CastSpell(done_by,SPELL_SUMMON_RESTLESS_APPARITION,false);
     }
 
@@ -66,16 +66,16 @@ struct TRINITY_DLL_DECL mobs_risen_husk_spiritAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if( ConsumeFlesh_Timer < diff )
+        if (ConsumeFlesh_Timer < diff)
         {
-            if( m_creature->GetEntry() == 23555 )
+            if (m_creature->GetEntry() == 23555)
                 DoCast(m_creature->getVictim(),SPELL_CONSUME_FLESH);
             ConsumeFlesh_Timer = 15000;
         } else ConsumeFlesh_Timer -= diff;
 
-        if( IntangiblePresence_Timer < diff )
+        if (IntangiblePresence_Timer < diff)
         {
-            if( m_creature->GetEntry() == 23554 )
+            if (m_creature->GetEntry() == 23554)
                 DoCast(m_creature->getVictim(),SPELL_INTANGIBLE_PRESENCE);
             IntangiblePresence_Timer = 20000;
         } else IntangiblePresence_Timer -= diff;
@@ -92,11 +92,11 @@ CreatureAI* GetAI_mobs_risen_husk_spirit(Creature *_Creature)
 ## npc_restless_apparition
 ######*/
 
-bool GossipHello_npc_restless_apparition(Player *player, Creature *_Creature)
+bool GossipHello_npc_restless_apparition(Player* pPlayer, Creature *_Creature)
 {
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
-    player->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
+    pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
     _Creature->SetInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
 
     return true;
@@ -123,15 +123,15 @@ CreatureAI* GetAI_npc_deserter_agitator(Creature *_Creature)
     return new npc_deserter_agitatorAI (_Creature);
 }
 
-bool GossipHello_npc_deserter_agitator(Player *player, Creature *_Creature)
+bool GossipHello_npc_deserter_agitator(Player* pPlayer, Creature *_Creature)
 {
-    if (player->GetQuestStatus(11126) == QUEST_STATUS_INCOMPLETE)
+    if (pPlayer->GetQuestStatus(11126) == QUEST_STATUS_INCOMPLETE)
     {
         _Creature->setFaction(1883);
-        player->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
+        pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
     }
     else
-        player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
@@ -142,25 +142,25 @@ bool GossipHello_npc_deserter_agitator(Player *player, Creature *_Creature)
 
 #define GOSSIP_ITEM_JAINA "I know this is rather silly but i have a young ward who is a bit shy and would like your autograph."
 
-bool GossipHello_npc_lady_jaina_proudmoore(Player *player, Creature *_Creature)
+bool GossipHello_npc_lady_jaina_proudmoore(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( player->GetQuestStatus(558) == QUEST_STATUS_INCOMPLETE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_JAINA, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO );
+    if (pPlayer->GetQuestStatus(558) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_JAINA, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_lady_jaina_proudmoore(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_lady_jaina_proudmoore(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_SENDER_INFO )
+    if (action == GOSSIP_SENDER_INFO)
     {
-        player->SEND_GOSSIP_MENU( 7012, _Creature->GetGUID() );
-        player->CastSpell( player, 23122, false);
+        pPlayer->SEND_GOSSIP_MENU(7012, _Creature->GetGUID());
+        pPlayer->CastSpell(pPlayer, 23122, false);
     }
     return true;
 }
@@ -169,26 +169,26 @@ bool GossipSelect_npc_lady_jaina_proudmoore(Player *player, Creature *_Creature,
 ## npc_nat_pagle
 ######*/
 
-bool GossipHello_npc_nat_pagle(Player *player, Creature *_Creature)
+bool GossipHello_npc_nat_pagle(Player* pPlayer, Creature *_Creature)
 {
-    if(_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if(_Creature->isVendor() && player->GetQuestRewardStatus(8227))
+    if (_Creature->isVendor() && pPlayer->GetQuestRewardStatus(8227))
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
-        player->SEND_GOSSIP_MENU( 7640, _Creature->GetGUID() );
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+        pPlayer->SEND_GOSSIP_MENU(7640, _Creature->GetGUID());
     }
     else
-        player->SEND_GOSSIP_MENU( 7638, _Creature->GetGUID() );
+        pPlayer->SEND_GOSSIP_MENU(7638, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_nat_pagle(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_nat_pagle(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if(action == GOSSIP_ACTION_TRADE)
-        player->SEND_VENDORLIST( _Creature->GetGUID() );
+    if (action == GOSSIP_ACTION_TRADE)
+        pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
 
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp
index 7357789a5aa..5ae64dff709 100644
--- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp
+++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp
@@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL mobs_ghoul_flayerAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if( Killer->GetTypeId() == TYPEID_PLAYER )
+        if (Killer->GetTypeId() == TYPEID_PLAYER)
             m_creature->SummonCreature(11064, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 60000);
     }
 };
@@ -58,22 +58,22 @@ CreatureAI* GetAI_mobs_ghoul_flayer(Creature *_Creature)
 ## npc_augustus_the_touched
 ######*/
 
-bool GossipHello_npc_augustus_the_touched(Player *player, Creature *_Creature)
+bool GossipHello_npc_augustus_the_touched(Player* pPlayer, Creature *_Creature)
 {
-    if( _Creature->isQuestGiver() )
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( _Creature->isVendor() && player->GetQuestRewardStatus(6164) )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+    if (_Creature->isVendor() && pPlayer->GetQuestRewardStatus(6164))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_augustus_the_touched(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_augustus_the_touched(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_TRADE )
-        player->SEND_VENDORLIST( _Creature->GetGUID() );
+    if (action == GOSSIP_ACTION_TRADE)
+        pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
     return true;
 }
 
@@ -101,10 +101,10 @@ CreatureAI* GetAI_npc_darrowshire_spirit(Creature *_Creature)
     return new npc_darrowshire_spiritAI (_Creature);
 }
 
-bool GossipHello_npc_darrowshire_spirit(Player *player, Creature *_Creature)
+bool GossipHello_npc_darrowshire_spirit(Player* pPlayer, Creature *_Creature)
 {
-    player->SEND_GOSSIP_MENU(3873,_Creature->GetGUID());
-    player->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(3873,_Creature->GetGUID());
+    pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
     _Creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
     return true;
 }
@@ -113,38 +113,38 @@ bool GossipHello_npc_darrowshire_spirit(Player *player, Creature *_Creature)
 ## npc_tirion_fordring
 ######*/
 
-bool GossipHello_npc_tirion_fordring(Player *player, Creature *_Creature)
+bool GossipHello_npc_tirion_fordring(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(5742) == QUEST_STATUS_INCOMPLETE && player->getStandState() == UNIT_STAND_STATE_SIT )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready to hear your tale, Tirion.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(5742) == QUEST_STATUS_INCOMPLETE && pPlayer->getStandState() == UNIT_STAND_STATE_SIT)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready to hear your tale, Tirion.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_tirion_fordring(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_tirion_fordring(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thank you, Tirion.  What of your identity?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(4493, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thank you, Tirion.  What of your identity?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(4493, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "That is terrible.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(4494, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "That is terrible.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(4494, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will, Tirion.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->SEND_GOSSIP_MENU(4495, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will, Tirion.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(4495, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(5742);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(5742);
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
index cd688ed96d6..b820b947e9e 100644
--- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
+++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
@@ -736,9 +736,9 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
     npc_unworthy_initiateAI(Creature *c) : ScriptedAI(c)
     {
         me->SetReactState(REACT_PASSIVE);
-        if(!me->GetEquipmentId())
-            if(const CreatureInfo *info = GetCreatureInfo(28406))
-                if(info->equipmentId)
+        if (!me->GetEquipmentId())
+            if (const CreatureInfo *info = GetCreatureInfo(28406))
+                if (info->equipmentId)
                     const_cast<CreatureInfo*>(me->GetCreatureInfo())->equipmentId = info->equipmentId;
     }
 
@@ -773,15 +773,15 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
 
     void MovementInform(uint32 type, uint32 id)
     {
-        if(type != POINT_MOTION_TYPE)
+        if (type != POINT_MOTION_TYPE)
             return;
 
-        if(id == 1)
+        if (id == 1)
         {
             wait_timer = 5000;
             m_creature->CastSpell(m_creature,SPELL_DK_INITIATE_VISUAL,true);
 
-            if(Unit* starter = Unit::GetUnit((*m_creature),event_starter))
+            if (Unit* starter = Unit::GetUnit((*m_creature),event_starter))
                 DoScriptText(say_event_attack[rand()%9],m_creature,starter);
 
             phase = PHASE_TO_ATTACK;
@@ -820,7 +820,7 @@ struct TRINITY_DLL_DECL npc_unworthy_initiate_anchorAI : public PassiveAI
 
     void SetGUID(const uint64 &guid, int32 id)
     {
-        if(!prisonerGUID)
+        if (!prisonerGUID)
             prisonerGUID = guid;
     }
 
@@ -832,7 +832,7 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
     switch(phase)
     {
     case PHASE_CHAINED:
-        if(!anchorGUID)
+        if (!anchorGUID)
         {
             float x, y, z;
             float dist = 99.0f;
@@ -840,9 +840,9 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
 
             for(uint8 i = 0; i < 12; ++i)
             {
-                if(GameObject* temp_prison = m_creature->FindNearestGameObject(acherus_soul_prison[i],30))
+                if (GameObject* temp_prison = m_creature->FindNearestGameObject(acherus_soul_prison[i],30))
                 {
-                    if(dist == 99.0f || m_creature->IsWithinDist(temp_prison, dist, false))
+                    if (dist == 99.0f || m_creature->IsWithinDist(temp_prison, dist, false))
                     {
                         temp_prison->GetPosition(x, y, z);
                         dist = m_creature->GetDistance2d(temp_prison);
@@ -851,10 +851,10 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
                 }
             }
 
-            if(!prison)
+            if (!prison)
                 return;
 
-            if(Creature* trigger = me->FindNearestCreature(29521, 30))
+            if (Creature* trigger = me->FindNearestCreature(29521, 30))
             {
                 prison->ResetDoorOrButton();
                 trigger->AI()->SetGUID(m_creature->GetGUID());
@@ -864,9 +864,9 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
         }
         return;
     case PHASE_TO_EQUIP:
-        if(wait_timer)
+        if (wait_timer)
         {
-            if(wait_timer < diff)
+            if (wait_timer < diff)
             {
                 m_creature->GetMotionMaster()->MovePoint(1,targ_x,targ_y,m_creature->GetPositionZ());
                 phase = PHASE_EQUIPING;
@@ -875,22 +875,22 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
         }
         return;
     case PHASE_TO_ATTACK:
-        if(wait_timer)
+        if (wait_timer)
         {
-            if(wait_timer < diff)
+            if (wait_timer < diff)
             {
                 m_creature->setFaction(14);
                 m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
                 phase = PHASE_ATTACKING;
 
-                if(Unit* target = Unit::GetUnit((*m_creature),event_starter))
+                if (Unit* target = Unit::GetUnit((*m_creature),event_starter))
                     m_creature->AI()->AttackStart(target);
                 wait_timer = 0;
             }else wait_timer -= diff;
         }
         return;
     case PHASE_ATTACKING:
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         events.Update(diff);
@@ -932,12 +932,12 @@ CreatureAI* GetAI_npc_unworthy_initiate_anchor(Creature *_Creature)
     return new npc_unworthy_initiate_anchorAI(_Creature);
 }
 
-bool GOHello_go_acherus_soul_prison(Player *player, GameObject* go)
+bool GOHello_go_acherus_soul_prison(Player* pPlayer, GameObject* go)
 {
-    if(Creature *anchor = go->FindNearestCreature(29521, 15))
-        if(uint64 prisonerGUID = anchor->AI()->GetGUID())
-            if(Creature* prisoner = Creature::GetCreature(*player, prisonerGUID))
-                CAST_AI(npc_unworthy_initiateAI, (prisoner->AI()))->EventStart(anchor, player);
+    if (Creature *anchor = go->FindNearestCreature(29521, 15))
+        if (uint64 prisonerGUID = anchor->AI()->GetGUID())
+            if (Creature* prisoner = Creature::GetCreature(*pPlayer, prisonerGUID))
+                CAST_AI(npc_unworthy_initiateAI, (prisoner->AI()))->EventStart(anchor, pPlayer);
 
     return false;
 }
@@ -1012,13 +1012,13 @@ struct TRINITY_DLL_DECL npc_death_knight_initiateAI : public SpellAI
     {
         if (m_bIsDuelInProgress && pDoneBy->IsControlledByPlayer())
         {
-            if(pDoneBy->GetGUID() != m_uiDuelerGUID || pDoneBy->GetOwnerGUID() != m_uiDuelerGUID) // other players cannot help
+            if (pDoneBy->GetGUID() != m_uiDuelerGUID || pDoneBy->GetOwnerGUID() != m_uiDuelerGUID) // other players cannot help
                 uiDamage = 0;
-            else if(uiDamage >= m_creature->GetHealth()) 
+            else if (uiDamage >= m_creature->GetHealth()) 
             {
                 uiDamage = 0;
 
-                if(!lose)
+                if (!lose)
                 {
                     pDoneBy->RemoveGameObject(SPELL_DUEL_FLAG, true);
                     pDoneBy->AttackStop();
@@ -1052,13 +1052,13 @@ struct TRINITY_DLL_DECL npc_death_knight_initiateAI : public SpellAI
 
         if (m_bIsDuelInProgress)
         {
-            if(lose)
+            if (lose)
             {
-                if(!me->HasAura(7267))
+                if (!me->HasAura(7267))
                     EnterEvadeMode();
                 return;
             }
-            else if(me->getVictim()->GetTypeId() == TYPEID_PLAYER
+            else if (me->getVictim()->GetTypeId() == TYPEID_PLAYER
                 && me->getVictim()->GetHealth() * 10 < me->getVictim()->GetMaxHealth())
             {
                 me->getVictim()->CastSpell(me->getVictim(), 7267, true); // beg
@@ -1083,10 +1083,10 @@ bool GossipHello_npc_death_knight_initiate(Player* pPlayer, Creature* pCreature)
 {
     if (pPlayer->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE && pCreature->GetHealth() == pCreature->GetMaxHealth())
     {
-        if(pPlayer->GetHealth() * 10 < pPlayer->GetMaxHealth())
+        if (pPlayer->GetHealth() * 10 < pPlayer->GetMaxHealth())
             return true;
 
-        if(pPlayer->isInCombat() || pCreature->isInCombat())
+        if (pPlayer->isInCombat() || pCreature->isInCombat())
             return true;
 
         pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ACCEPT_DUEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
@@ -1097,16 +1097,16 @@ bool GossipHello_npc_death_knight_initiate(Player* pPlayer, Creature* pCreature)
 
 bool GossipSelect_npc_death_knight_initiate(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
 {
-    if( uiAction == GOSSIP_ACTION_INFO_DEF )
+    if (uiAction == GOSSIP_ACTION_INFO_DEF)
     {
         pPlayer->CLOSE_GOSSIP_MENU();
 
-        if(pPlayer->isInCombat() || pCreature->isInCombat())
+        if (pPlayer->isInCombat() || pCreature->isInCombat())
             return true;
 
         if (npc_death_knight_initiateAI* pInitiateAI = CAST_AI(npc_death_knight_initiateAI, pCreature->AI()))
         {
-            if(pInitiateAI->m_bIsDuelInProgress)
+            if (pInitiateAI->m_bIsDuelInProgress)
                 return true;
         }
 
@@ -1217,15 +1217,15 @@ struct TRINITY_DLL_DECL npc_salanar_the_horsemanAI : public ScriptedAI
     {
         if (spell->Id == DELIVER_STOLEN_HORSE)
         {
-            if(caster->GetTypeId() == TYPEID_UNIT && CAST_CRE(caster)->isVehicle())
+            if (caster->GetTypeId() == TYPEID_UNIT && CAST_CRE(caster)->isVehicle())
             {
-                if( Unit *charmer = caster->GetCharmer() )
+                if (Unit *charmer = caster->GetCharmer())
                 {
                     charmer->ExitVehicle();
                     caster->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
                     caster->setFaction(35);
                     DoCast(caster, CALL_DARK_RIDER, true);
-                    if(Creature* Dark_Rider = m_creature->FindNearestCreature(28654, 15))
+                    if (Creature* Dark_Rider = m_creature->FindNearestCreature(28654, 15))
                         CAST_AI(npc_dark_rider_of_acherusAI, Dark_Rider->AI())->InitDespawnHorse(caster);
                 }
             }
@@ -1236,19 +1236,19 @@ struct TRINITY_DLL_DECL npc_salanar_the_horsemanAI : public ScriptedAI
     {
         ScriptedAI::MoveInLineOfSight(who);
 
-        if(who->GetTypeId() == TYPEID_UNIT && CAST_CRE(who)->isVehicle() && me->IsWithinDistInMap(who, 10.0f))
+        if (who->GetTypeId() == TYPEID_UNIT && CAST_CRE(who)->isVehicle() && me->IsWithinDistInMap(who, 10.0f))
         {
-            if( Unit *charmer = who->GetCharmer() )
+            if (Unit *charmer = who->GetCharmer())
             {
-                if( charmer->GetTypeId() == TYPEID_PLAYER )
+                if (charmer->GetTypeId() == TYPEID_PLAYER)
                 {
                     switch(me->GetEntry())
                     {
                         // for quest Into the Realm of Shadows(12687)
                         case 28788:
-                            if( CAST_PLR(charmer)->GetQuestStatus(12687) == QUEST_STATUS_INCOMPLETE )
+                            if (CAST_PLR(charmer)->GetQuestStatus(12687) == QUEST_STATUS_INCOMPLETE)
                             {
-                                if(CAST_PLR(charmer)->HasAura(REALM_OF_SHADOWS))
+                                if (CAST_PLR(charmer)->HasAura(REALM_OF_SHADOWS))
                                     charmer->RemoveAurasDueToSpell(REALM_OF_SHADOWS);
                                 CAST_PLR(charmer)->GroupEventHappens(12687, me);
                             }
@@ -1285,19 +1285,19 @@ struct TRINITY_DLL_DECL npc_ros_dark_riderAI : public ScriptedAI
     void Reset()
     {
         Creature* deathcharger = me->FindNearestCreature(28782, 30);
-        if(!deathcharger) return;
+        if (!deathcharger) return;
         deathcharger->RestoreFaction();
         deathcharger->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
         deathcharger->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-        if(!me->m_Vehicle && deathcharger->isVehicle() && CAST_VEH(deathcharger)->HasEmptySeat(0))
+        if (!me->m_Vehicle && deathcharger->isVehicle() && CAST_VEH(deathcharger)->HasEmptySeat(0))
             me->EnterVehicle(CAST_VEH(deathcharger));
     }
 
     void JustDied(Unit *killer)
     {
         Creature* deathcharger = me->FindNearestCreature(28782, 30);
-        if(!deathcharger) return;
-        if( killer->GetTypeId() == TYPEID_PLAYER && deathcharger->GetTypeId() == TYPEID_UNIT && deathcharger->isVehicle() )
+        if (!deathcharger) return;
+        if (killer->GetTypeId() == TYPEID_PLAYER && deathcharger->GetTypeId() == TYPEID_UNIT && deathcharger->isVehicle())
         {
             deathcharger->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
             deathcharger->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -1320,13 +1320,13 @@ struct TRINITY_DLL_DECL npc_dkc1_gothikAI : public ScriptedAI
     {
         ScriptedAI::MoveInLineOfSight(who);
 
-        if(who->GetEntry() == 28845 && me->IsWithinDistInMap(who, 10.0f))
+        if (who->GetEntry() == 28845 && me->IsWithinDistInMap(who, 10.0f))
         {
-            if(Unit *owner = who->GetOwner())
+            if (Unit *owner = who->GetOwner())
             {
-                if(owner->GetTypeId() == TYPEID_PLAYER)
+                if (owner->GetTypeId() == TYPEID_PLAYER)
                 {
-                    if(CAST_PLR(owner)->GetQuestStatus(12698) == QUEST_STATUS_INCOMPLETE)
+                    if (CAST_PLR(owner)->GetQuestStatus(12698) == QUEST_STATUS_INCOMPLETE)
                     {
                         CAST_CRE(who)->CastSpell(owner, 52517, true);
                         CAST_CRE(who)->ForcedDespawn();
@@ -1411,7 +1411,7 @@ struct TRINITY_DLL_DECL npc_valkyr_battle_maidenAI : public ScriptedAI
                     phase = 2;
                     break;
                 case 2:
-                    if(!Owner->isRessurectRequested())
+                    if (!Owner->isRessurectRequested())
                     {
                         m_creature->HandleEmoteCommand(EMOTE_ONESHOT_CUSTOMSPELL01);
                         DoCast(Owner, SPELL_REVIVE,true);
diff --git a/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp b/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp
index 6fe009743e0..b19ad15b6e0 100644
--- a/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp
+++ b/src/bindings/scripts/scripts/zone/elwynn_forest/elwynn_forest.cpp
@@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL npc_henze_faulkAI : public ScriptedAI
     {
         if (m_creature->IsStandState())
         {
-            if(lifeTimer < diff)
+            if (lifeTimer < diff)
             {
                 EnterEvadeMode();
                 return;
@@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL npc_henze_faulkAI : public ScriptedAI
 
     void SpellHit(Unit *Hitter, const SpellEntry *Spellkind)
     {
-        if(Spellkind->Id == 8593 && !spellHit)
+        if (Spellkind->Id == 8593 && !spellHit)
         {
             DoCast(m_creature,32343);
             m_creature->SetStandState(UNIT_STAND_STATE_STAND);
diff --git a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp
index 2b9c74d9d18..f921e2cec7a 100644
--- a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp
+++ b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp
@@ -52,15 +52,15 @@ struct TRINITY_DLL_DECL npc_prospector_anvilwardAI : public npc_escortAI
     // Pure Virtual Functions
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if(!player)
+        if (!pPlayer)
             return;
 
         switch (i)
         {
-            case 0: DoScriptText(SAY_PR_1, m_creature, player); break;
-            case 5: DoScriptText(SAY_PR_2, m_creature, player); break;
+            case 0: DoScriptText(SAY_PR_1, m_creature, pPlayer); break;
+            case 5: DoScriptText(SAY_PR_2, m_creature, pPlayer); break;
             case 6: m_creature->setFaction(24); break;
         }
     }
@@ -92,26 +92,26 @@ CreatureAI* GetAI_npc_prospector_anvilward(Creature* pCreature)
     return thisAI;
 }
 
-bool GossipHello_npc_prospector_anvilward(Player *player, Creature *_Creature)
+bool GossipHello_npc_prospector_anvilward(Player* pPlayer, Creature *_Creature)
 {
-    if( player->GetQuestStatus(QUEST_THE_DWARVEN_SPY) == QUEST_STATUS_INCOMPLETE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(QUEST_THE_DWARVEN_SPY) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(8239, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(8239, _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_prospector_anvilward(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_prospector_anvilward(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch(action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->SEND_GOSSIP_MENU(8240, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(8240, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->CLOSE_GOSSIP_MENU();
-            CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, false, player->GetGUID());
+            pPlayer->CLOSE_GOSSIP_MENU();
+            CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, false, pPlayer->GetGUID());
             break;
     }
     return true;
@@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI
       spellJudLight   = false;
       spellCommand    = false;
 
-      switch(m_creature->GetEntry() ) {
+      switch(m_creature->GetEntry()) {
         case CHAMPION_BLOODWRATH :
           spellFlashLight = true;
           timerFlashLight = TIMER_FLASH_OF_LIGHT;
@@ -234,15 +234,15 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-      if ( questPhase == 1 ) {
+      if (questPhase == 1) {
 
-        if ( timer < diff ) {
+        if (timer < diff) {
               m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_STAND);
               m_creature->setFaction(FACTION_HOSTILE);
               questPhase = 0;
 
               Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-              if(target && target->GetTypeId() == TYPEID_PLAYER) // only on players.
+              if (target && target->GetTypeId() == TYPEID_PLAYER) // only on players.
               {
                 m_creature->AddThreat(target, 5000000.0f);
                 AttackStart(target);
@@ -255,40 +255,40 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI
           return;
 
       // healer
-      if ( spellFlashLight ) {
-        if ( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 70 ){
-          if ( timerFlashLight < diff ) {
+      if (spellFlashLight) {
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 70){
+          if (timerFlashLight < diff) {
             DoCast(m_creature, SPELL_FLASH_OF_LIGHT);
-            timerFlashLight = TIMER_FLASH_OF_LIGHT +  rand()%( TIMER_FLASH_OF_LIGHT );
+            timerFlashLight = TIMER_FLASH_OF_LIGHT +  rand()%(TIMER_FLASH_OF_LIGHT);
           }
           else
             timerFlashLight -= diff;
         }
       }
 
-      if ( spellJustice ) {
-          if ( timerJustice < diff )
+      if (spellJustice) {
+          if (timerJustice < diff)
             {
             DoCast(m_creature, SPELL_SEAL_OF_JUSTICE);
-            timerJustice = TIMER_SEAL_OF_JUSTICE +  rand()%( TIMER_SEAL_OF_JUSTICE );
+            timerJustice = TIMER_SEAL_OF_JUSTICE +  rand()%(TIMER_SEAL_OF_JUSTICE);
           }
           else
             timerJustice -= diff;
       }
 
-      if ( spellJudLight ) {
-          if ( timerJudLight < diff ) {
+      if (spellJudLight) {
+          if (timerJudLight < diff) {
             DoCast(m_creature,  SPELL_JUDGEMENT_OF_LIGHT);
-            timerJudLight = TIMER_JUDGEMENT_OF_LIGHT +  rand()%( TIMER_JUDGEMENT_OF_LIGHT );
+            timerJudLight = TIMER_JUDGEMENT_OF_LIGHT +  rand()%(TIMER_JUDGEMENT_OF_LIGHT);
           }
           else
             timerJudLight -= diff;
       }
 
-      if ( spellCommand ) {
-          if ( timerCommand < diff ) {
+      if (spellCommand) {
+          if (timerCommand < diff) {
             DoCast(m_creature,  TIMER_SEAL_OF_COMMAND);
-            timerCommand = TIMER_SEAL_OF_COMMAND +  rand()%( TIMER_SEAL_OF_COMMAND );
+            timerCommand = TIMER_SEAL_OF_COMMAND +  rand()%(TIMER_SEAL_OF_COMMAND);
           }
           else
             timerCommand -= diff;
@@ -330,19 +330,19 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-      // Quest accepted but object not activated, object despawned (if in sync 1 minute! )
-      if ( questPhase == 1 ) {
-         if ( timer < diff ) Reset();
+      // Quest accepted but object not activated, object despawned (if in sync 1 minute!)
+      if (questPhase == 1) {
+         if (timer < diff) Reset();
          else timer -= diff;
       }
       // fight the 4 paladin mobs phase
-      else if ( questPhase == 2 ) {
+      else if (questPhase == 2) {
 
-        if ( timer < diff ) {
+        if (timer < diff) {
 
           Creature* paladinSpawn;
           paladinSpawn = (Unit::GetCreature((*m_creature), paladinGuid[paladinPhase]));
-            if ( paladinSpawn ) {
+            if (paladinSpawn) {
                CAST_AI(npc_secondTrialAI, paladinSpawn->AI())->Activate(m_creature->GetGUID());
 
                switch(paladinPhase) {
@@ -378,13 +378,13 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI
     void StartEvent()
     {
 
-      if ( questPhase == 1 ) { // no player check, quest can be finished as group, so no complex playerguid/group search code
+      if (questPhase == 1) { // no player check, quest can be finished as group, so no complex PlayerGUID/group search code
 
         for (int i = 0; i<4; ++i) {
           Creature* Summoned;
           Summoned = DoSpawnCreature(PaladinEntry[i], SpawnPosition[i].x, SpawnPosition[i].y, SpawnPosition[i].z, SpawnPosition[i].o, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000);
 
-          if(Summoned)
+          if (Summoned)
             paladinGuid[i] = Summoned->GetGUID();
         }
 
@@ -398,26 +398,26 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI
 };
 
 
-bool GossipHello_master_kelerun_bloodmourn(Player *player, Creature *_Creature)
+bool GossipHello_master_kelerun_bloodmourn(Player* pPlayer, Creature *_Creature)
 {
     // quest only available if not already started
     // Quest_template flag is set to : QUEST_FLAGS_EVENT
     // Escort quests or any other event-driven quests. If player in party, all players that can accept this quest will receive confirmation box to accept quest.
     // !not sure if this really works!
 
-    if ( CAST_AI(master_kelerun_bloodmournAI, _Creature->AI())->questPhase == 0 ) {
-        player->PrepareQuestMenu(_Creature->GetGUID());
-        player->SendPreparedQuest(_Creature->GetGUID());
+    if (CAST_AI(master_kelerun_bloodmournAI, _Creature->AI())->questPhase == 0) {
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
+        pPlayer->SendPreparedQuest(_Creature->GetGUID());
     }
 
-    player->SEND_GOSSIP_MENU(_Creature->GetEntry(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetEntry(), _Creature->GetGUID());
     return true;
 }
 
-bool QuestAccept_master_kelerun_bloodmourn(Player *player, Creature *creature, Quest const *quest )
+bool QuestAccept_master_kelerun_bloodmourn(Player* pPlayer, Creature *creature, Quest const *quest)
 {
     // One Player exclusive quest, wait for user go activation
-    if(quest->GetQuestId() == QUEST_SECOND_TRIAL )
+    if (quest->GetQuestId() == QUEST_SECOND_TRIAL)
         CAST_AI(master_kelerun_bloodmournAI, creature->AI())->questPhase = 1;
 
     return true;
@@ -425,11 +425,11 @@ bool QuestAccept_master_kelerun_bloodmourn(Player *player, Creature *creature, Q
 
 void master_kelerun_bloodmournAI::SecondTrialKill() {
 
-      if ( questPhase > 0 ) {
+      if (questPhase > 0) {
 
         ++paladinPhase;
 
-        if ( paladinPhase < 4 )
+        if (paladinPhase < 4)
           questPhase=2;
         else
           Reset();  // Quest Complete, QuestComplete handler is in npc_secondTrialAI::JustDied
@@ -443,26 +443,26 @@ void npc_secondTrialAI::JustDied(Unit* Killer) {
           Creature* Summoner;
           Summoner = (Unit::GetCreature((*m_creature), summonerGuid));
 
-          if ( Summoner )
+          if (Summoner)
             CAST_AI(master_kelerun_bloodmournAI, Summoner->AI())->SecondTrialKill();
 
           // last kill quest complete for group
-          if ( m_creature->GetEntry() == CHAMPION_SUNSTRIKER ) {
+          if (m_creature->GetEntry() == CHAMPION_SUNSTRIKER) {
 
-            if( Group *pGroup = CAST_PLR(Killer)->GetGroup() )
+            if (Group *pGroup = CAST_PLR(Killer)->GetGroup())
             {
                for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
                {
                  Player *pGroupGuy = itr->getSource();
 
                  // for any leave or dead (with not released body) group member at appropriate distance
-                 if( pGroupGuy && pGroupGuy->IsAtGroupRewardDistance(m_creature) && !pGroupGuy->GetCorpse() && pGroupGuy->GetQuestStatus( QUEST_SECOND_TRIAL ) == QUEST_STATUS_INCOMPLETE )
-                   pGroupGuy->CompleteQuest( QUEST_SECOND_TRIAL );
+                 if (pGroupGuy && pGroupGuy->IsAtGroupRewardDistance(m_creature) && !pGroupGuy->GetCorpse() && pGroupGuy->GetQuestStatus(QUEST_SECOND_TRIAL) == QUEST_STATUS_INCOMPLETE)
+                   pGroupGuy->CompleteQuest(QUEST_SECOND_TRIAL);
                 }
             }
             else {
-               if ( CAST_PLR(Killer)->GetQuestStatus( QUEST_SECOND_TRIAL ) == QUEST_STATUS_INCOMPLETE )
-                   CAST_PLR(Killer)->CompleteQuest( QUEST_SECOND_TRIAL );
+               if (CAST_PLR(Killer)->GetQuestStatus(QUEST_SECOND_TRIAL) == QUEST_STATUS_INCOMPLETE)
+                   CAST_PLR(Killer)->CompleteQuest(QUEST_SECOND_TRIAL);
             }
           }
       }
@@ -470,9 +470,9 @@ void npc_secondTrialAI::JustDied(Unit* Killer) {
 
 void npc_secondTrialAI::KilledUnit(Unit* Killed) {
 
-  if ( Killed->GetTypeId() == TYPEID_PLAYER ) {
+  if (Killed->GetTypeId() == TYPEID_PLAYER) {
 
-      if ( CAST_PLR(Killed)->GetQuestStatus(QUEST_SECOND_TRIAL) == QUEST_STATUS_INCOMPLETE )
+      if (CAST_PLR(Killed)->GetQuestStatus(QUEST_SECOND_TRIAL) == QUEST_STATUS_INCOMPLETE)
         CAST_PLR(Killed)->FailQuest(QUEST_SECOND_TRIAL);
   }
 }
@@ -497,7 +497,7 @@ CreatureAI* GetAI_npc_secondTrial(Creature *_Creature)
 ## go_second_trial
 ######*/
 
-bool GOHello_go_second_trial(Player *player, GameObject* pGO)
+bool GOHello_go_second_trial(Player* pPlayer, GameObject* pGO)
 {
     // find spawn :: master_kelerun_bloodmourn
     if (Creature* pCreature = pGO->FindNearestCreature(MASTER_KELERUN_BLOODMOURN, 30.0f))
@@ -549,25 +549,25 @@ struct TRINITY_DLL_DECL npc_apprentice_mirvedaAI : public ScriptedAI
     {
         if (PlayerGUID)
         {
-            Player* player = Unit::GetPlayer(PlayerGUID);
-            if (player)
-                CAST_PLR(player)->FailQuest(QUEST_UNEXPECTED_RESULT);
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (pPlayer)
+                CAST_PLR(pPlayer)->FailQuest(QUEST_UNEXPECTED_RESULT);
         }
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(KillCount >= 3)
+        if (KillCount >= 3)
         {
             if (PlayerGUID)
             {
-                Player* player = Unit::GetPlayer(PlayerGUID);
-                if(player)
-                    CAST_PLR(player)->CompleteQuest(QUEST_UNEXPECTED_RESULT);
+                Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+                if (pPlayer)
+                    CAST_PLR(pPlayer)->CompleteQuest(QUEST_UNEXPECTED_RESULT);
             }
         }
 
-        if(Summon)
+        if (Summon)
         {
             m_creature->SummonCreature(MOB_GHARZUL, 8745, -7134.32, 35.22, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000);
             m_creature->SummonCreature(MOB_ANGERSHADE, 8745, -7134.32, 35.22, 0, TEMPSUMMON_CORPSE_DESPAWN, 4000);
@@ -577,12 +577,12 @@ struct TRINITY_DLL_DECL npc_apprentice_mirvedaAI : public ScriptedAI
     }
 };
 
-bool QuestAccept_npc_apprentice_mirveda(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_apprentice_mirveda(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_UNEXPECTED_RESULT)
     {
         CAST_AI(npc_apprentice_mirvedaAI, creature->AI())->Summon = true;
-        CAST_AI(npc_apprentice_mirvedaAI, creature->AI())->PlayerGUID = player->GetGUID();
+        CAST_AI(npc_apprentice_mirvedaAI, creature->AI())->PlayerGUID = pPlayer->GetGUID();
     }
     return true;
 }
@@ -638,9 +638,9 @@ struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI
 
     void MoveInLineOfSight(Unit* who)
     {
-        if(!Progress && who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 10.0f))
+        if (!Progress && who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 10.0f))
         {
-            if( CAST_PLR(who)->GetQuestStatus(QUEST_POWERING_OUR_DEFENSES) == QUEST_STATUS_INCOMPLETE )
+            if (CAST_PLR(who)->GetQuestStatus(QUEST_POWERING_OUR_DEFENSES) == QUEST_STATUS_INCOMPLETE)
             {
                 PlayerGUID = who->GetGUID();
                 WaveTimer = 1000;
@@ -659,29 +659,29 @@ struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI
     {
         if (PlayerGUID && !Completed)
         {
-            Player* player = Unit::GetPlayer(PlayerGUID);
-            if (player)
-                CAST_PLR(player)->FailQuest(QUEST_POWERING_OUR_DEFENSES);
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (pPlayer)
+                CAST_PLR(pPlayer)->FailQuest(QUEST_POWERING_OUR_DEFENSES);
         }
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(EndTimer < diff && Progress)
+        if (EndTimer < diff && Progress)
         {
             DoScriptText(EMOTE, m_creature);
             Completed = true;
             if (PlayerGUID)
             {
-                Player* player = Unit::GetPlayer(PlayerGUID);
-                if(player)
-                    CAST_PLR(player)->CompleteQuest(QUEST_POWERING_OUR_DEFENSES);
+                Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+                if (pPlayer)
+                    CAST_PLR(pPlayer)->CompleteQuest(QUEST_POWERING_OUR_DEFENSES);
             }
             m_creature->DealDamage(m_creature,m_creature->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
             m_creature->RemoveCorpse();
         }else EndTimer -= diff;
 
-        if(WaveTimer < diff && !Completed && Progress)
+        if (WaveTimer < diff && !Completed && Progress)
         {
             uint32 ran1 = rand()%8;
             uint32 ran2 = rand()%8;
diff --git a/src/bindings/scripts/scripts/zone/felwood/felwood.cpp b/src/bindings/scripts/scripts/zone/felwood/felwood.cpp
index 7534d46c6e5..1382fcf67c1 100644
--- a/src/bindings/scripts/scripts/zone/felwood/felwood.cpp
+++ b/src/bindings/scripts/scripts/zone/felwood/felwood.cpp
@@ -33,46 +33,46 @@ EndContentData */
 
 #define GOSSIP_ITEM_BEACON  "Please make me a Cenarion Beacon"
 
-bool GossipHello_npcs_riverbreeze_and_silversky(Player *player, Creature *_Creature)
+bool GossipHello_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature *_Creature)
 {
     uint32 eCreature = _Creature->GetEntry();
 
-    if( _Creature->isQuestGiver() )
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( eCreature==9528 )
+    if (eCreature==9528)
     {
-        if( player->GetQuestRewardStatus(4101) )
+        if (pPlayer->GetQuestRewardStatus(4101))
         {
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-            player->SEND_GOSSIP_MENU(2848, _Creature->GetGUID());
-        }else if( player->GetTeam()==HORDE )
-        player->SEND_GOSSIP_MENU(2845, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+            pPlayer->SEND_GOSSIP_MENU(2848, _Creature->GetGUID());
+        }else if (pPlayer->GetTeam()==HORDE)
+        pPlayer->SEND_GOSSIP_MENU(2845, _Creature->GetGUID());
         else
-            player->SEND_GOSSIP_MENU(2844, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(2844, _Creature->GetGUID());
     }
 
-    if( eCreature==9529 )
+    if (eCreature==9529)
     {
-        if( player->GetQuestRewardStatus(4102) )
+        if (pPlayer->GetQuestRewardStatus(4102))
         {
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-            player->SEND_GOSSIP_MENU(2849, _Creature->GetGUID());
-        }else if( player->GetTeam() == ALLIANCE )
-        player->SEND_GOSSIP_MENU(2843, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+            pPlayer->SEND_GOSSIP_MENU(2849, _Creature->GetGUID());
+        }else if (pPlayer->GetTeam() == ALLIANCE)
+        pPlayer->SEND_GOSSIP_MENU(2843, _Creature->GetGUID());
         else
-            player->SEND_GOSSIP_MENU(2842, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(2842, _Creature->GetGUID());
     }
 
     return true;
 }
 
-bool GossipSelect_npcs_riverbreeze_and_silversky(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action==GOSSIP_ACTION_INFO_DEF+1 )
+    if (action==GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->CLOSE_GOSSIP_MENU();
-        _Creature->CastSpell(player, 15120, false);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        _Creature->CastSpell(pPlayer, 15120, false);
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/feralas/feralas.cpp b/src/bindings/scripts/scripts/zone/feralas/feralas.cpp
index e780c74e185..2f58acafaa0 100644
--- a/src/bindings/scripts/scripts/zone/feralas/feralas.cpp
+++ b/src/bindings/scripts/scripts/zone/feralas/feralas.cpp
@@ -30,27 +30,27 @@ EndScriptData */
 
 #define GOSSIP_HELLO "Buy somethin', will ya?"
 
-bool GossipHello_npc_gregan_brewspewer(Player *player, Creature *_Creature)
+bool GossipHello_npc_gregan_brewspewer(Player* pPlayer, Creature *_Creature)
 {
-    if( _Creature->isQuestGiver() )
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( _Creature->isVendor() && player->GetQuestStatus(3909) == QUEST_STATUS_INCOMPLETE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (_Creature->isVendor() && pPlayer->GetQuestStatus(3909) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(2433,_Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(2433,_Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_gregan_brewspewer(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_gregan_brewspewer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_INFO_DEF+1 )
+    if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
-        player->SEND_GOSSIP_MENU(2434,_Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+        pPlayer->SEND_GOSSIP_MENU(2434,_Creature->GetGUID());
     }
-    if( action == GOSSIP_ACTION_TRADE )
-        player->SEND_VENDORLIST( _Creature->GetGUID() );
+    if (action == GOSSIP_ACTION_TRADE)
+        pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
     return true;
 }
 
@@ -116,7 +116,7 @@ struct TRINITY_DLL_DECL npc_oox22feAI : public npc_escortAI
             case 37:
                 DoScriptText(SAY_END,m_creature);
                 // Award quest credit
-                if(Player* pPlayer = Unit::GetPlayer( PlayerGUID))
+                if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
                 {
                         pPlayer->GroupEventHappens(QUEST_RESCUE_OOX22FE, m_creature);
                 }
@@ -153,10 +153,10 @@ struct TRINITY_DLL_DECL npc_oox22feAI : public npc_escortAI
         if (!IsBeingEscorted)
             return;
 
-        if(Player* pPlayer = Unit::GetPlayer(PlayerGUID))
+        if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
         {
             // If NPC dies, player fails the quest
-            if(pPlayer->GetQuestStatus(QUEST_RESCUE_OOX22FE) != QUEST_STATUS_COMPLETE)
+            if (pPlayer->GetQuestStatus(QUEST_RESCUE_OOX22FE) != QUEST_STATUS_COMPLETE)
                 pPlayer->FailQuest(QUEST_RESCUE_OOX22FE);
         }
     }
@@ -200,10 +200,10 @@ bool QuestAccept_npc_oox22fe(Player* pPlayer, Creature* pCreature, const Quest*
 ## npc_screecher_spirit
 ######*/
 
-bool GossipHello_npc_screecher_spirit(Player *player, Creature *_Creature)
+bool GossipHello_npc_screecher_spirit(Player* pPlayer, Creature *_Creature)
 {
-    player->SEND_GOSSIP_MENU(2039, _Creature->GetGUID() );
-    player->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(2039, _Creature->GetGUID());
+    pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
     _Creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
 
     return true;
diff --git a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp
index 2509537edd4..6ed1ab8020c 100644
--- a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp
+++ b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp
@@ -37,26 +37,26 @@ EndContentData */
 
 #define GOSSIP_H_BKD "Take Blood Knight Insignia"
 
-bool GossipHello_npc_blood_knight_dawnstar(Player *player, Creature *_Creature)
+bool GossipHello_npc_blood_knight_dawnstar(Player* pPlayer, Creature *_Creature)
 {
-    if (player->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(24226,1,true))
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_BKD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(24226,1,true))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_BKD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_blood_knight_dawnstar(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_blood_knight_dawnstar(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
         ItemPosCountVec dest;
-        uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, 24226, 1, false);
-        if( msg == EQUIP_ERR_OK )
+        uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 24226, 1, false);
+        if (msg == EQUIP_ERR_OK)
         {
-            player->StoreNewItem( dest, 24226, 1, true);
-            player->PlayerTalkClass->ClearMenus();
+            pPlayer->StoreNewItem(dest, 24226, 1, true);
+            pPlayer->PlayerTalkClass->ClearMenus();
         }
     }
     return true;
@@ -68,24 +68,24 @@ bool GossipSelect_npc_blood_knight_dawnstar(Player *player, Creature *_Creature,
 
 #define GOSSIP_HBN "You gave the crew disguises?"
 
-bool GossipHello_npc_budd_nedreck(Player *player, Creature *_Creature)
+bool GossipHello_npc_budd_nedreck(Player* pPlayer, Creature *_Creature)
 {
-    if( _Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( player->GetQuestStatus(11166) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(11166) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_budd_nedreck(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_budd_nedreck(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_INFO_DEF )
+    if (action == GOSSIP_ACTION_INFO_DEF)
     {
-        player->CLOSE_GOSSIP_MENU();
-        _Creature->CastSpell(player, 42540, false);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        _Creature->CastSpell(pPlayer, 42540, false);
     }
     return true;
 }
@@ -94,25 +94,25 @@ bool GossipSelect_npc_budd_nedreck(Player *player, Creature *_Creature, uint32 s
 ## npc_rathis_tomber
 ######*/
 
-bool GossipHello_npc_rathis_tomber(Player *player, Creature *_Creature)
+bool GossipHello_npc_rathis_tomber(Player* pPlayer, Creature *_Creature)
 {
-    if( _Creature->isQuestGiver() )
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( _Creature->isVendor() && player->GetQuestRewardStatus(9152) )
+    if (_Creature->isVendor() && pPlayer->GetQuestRewardStatus(9152))
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
-        player->SEND_GOSSIP_MENU(8432, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+        pPlayer->SEND_GOSSIP_MENU(8432, _Creature->GetGUID());
     }else
-    player->SEND_GOSSIP_MENU(8431,_Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(8431,_Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_rathis_tomber(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_rathis_tomber(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_TRADE )
-        player->SEND_VENDORLIST( _Creature->GetGUID() );
+    if (action == GOSSIP_ACTION_TRADE)
+        pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
     return true;
 }
 
@@ -120,13 +120,13 @@ bool GossipSelect_npc_rathis_tomber(Player *player, Creature *_Creature, uint32
 ## go_gilded_brazier (Paladin First Trail quest (9678))
 #####*/
 
-bool GOHello_gilded_brazier(Player *player, GameObject* _GO)
+bool GOHello_gilded_brazier(Player* pPlayer, GameObject* _GO)
 {
-    if (player->GetQuestStatus(9678) == QUEST_STATUS_INCOMPLETE)
+    if (pPlayer->GetQuestStatus(9678) == QUEST_STATUS_INCOMPLETE)
     {
-        Creature *Stillblade = player->SummonCreature(17716, 8106.11, -7542.06, 151.775, 3.02598, TEMPSUMMON_DEAD_DESPAWN, 60000);
+        Creature *Stillblade = pPlayer->SummonCreature(17716, 8106.11, -7542.06, 151.775, 3.02598, TEMPSUMMON_DEAD_DESPAWN, 60000);
         if (Stillblade)
-            (Stillblade->AI())->AttackStart(player);
+            (Stillblade->AI())->AttackStart(pPlayer);
     }
     return true;
 };
@@ -159,9 +159,9 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!player)
+        if (!pPlayer)
             return;
 
         switch(i)
@@ -169,26 +169,26 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
         case 0:
             {
             m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
-            if(GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20))
+            if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20))
                 Cage->SetGoState(GO_STATE_ACTIVE);
-            DoScriptText(SAY_START, m_creature, player);
+            DoScriptText(SAY_START, m_creature, pPlayer);
             break;
             }
         case 5:
-            DoScriptText(SAY_PROGRESS1, m_creature, player);
+            DoScriptText(SAY_PROGRESS1, m_creature, pPlayer);
         case 11:
-            DoScriptText(SAY_PROGRESS2, m_creature, player);
+            DoScriptText(SAY_PROGRESS2, m_creature, pPlayer);
             m_creature->SetOrientation(4.762841);
             break;
         case 18:
             {
-            DoScriptText(SAY_PROGRESS3, m_creature, player);
+            DoScriptText(SAY_PROGRESS3, m_creature, pPlayer);
             Creature* Summ1 = m_creature->SummonCreature(16342, 7627.083984, -7532.538086, 152.128616, 1.082733, TEMPSUMMON_DEAD_DESPAWN, 0);
             Creature* Summ2 = m_creature->SummonCreature(16343, 7620.432129, -7532.550293, 152.454865, 0.827478, TEMPSUMMON_DEAD_DESPAWN, 0);
-            if(Summ1 && Summ2)
+            if (Summ1 && Summ2)
             {
                 Summ1->Attack(m_creature, true);
-                Summ2->Attack(player, true);
+                Summ2->Attack(pPlayer, true);
             }
             m_creature->AI()->AttackStart(Summ1);
             break;
@@ -196,19 +196,19 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
         case 19: m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break;
         case 25: m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break;
         case 30:
-            if (player && player->GetTypeId() == TYPEID_PLAYER)
-                CAST_PLR(player)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS,m_creature);
+            if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)
+                CAST_PLR(pPlayer)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS,m_creature);
             break;
         case 32:
             m_creature->SetOrientation(2.978281);
-            DoScriptText(SAY_END1, m_creature, player);
+            DoScriptText(SAY_END1, m_creature, pPlayer);
             break;
         case 33:
             m_creature->SetOrientation(5.858011);
-            DoScriptText(SAY_END2, m_creature, player);
+            DoScriptText(SAY_END2, m_creature, pPlayer);
             Unit* CaptainHelios = me->FindNearestCreature(NPC_CAPTAIN_HELIOS, 50);
-            if(CaptainHelios)
-            DoScriptText(SAY_CAPTAIN_ANSWER, CaptainHelios, player);
+            if (CaptainHelios)
+            DoScriptText(SAY_CAPTAIN_ANSWER, CaptainHelios, pPlayer);
             break;
         }
     }
@@ -221,7 +221,7 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
             m_creature->setFaction(1602);
 
         GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20);
-        if(Cage)
+        if (Cage)
         Cage->SetGoState(GO_STATE_READY);
     }
 
@@ -229,9 +229,9 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
     {
         if (PlayerGUID)
         {
-            Player* player = Unit::GetPlayer(PlayerGUID);
-            if (player)
-                CAST_PLR(player)->FailQuest(QUEST_ESCAPE_FROM_THE_CATACOMBS);
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (pPlayer)
+                CAST_PLR(pPlayer)->FailQuest(QUEST_ESCAPE_FROM_THE_CATACOMBS);
         }
     }
 
@@ -241,12 +241,12 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
     }
 };
 
-bool QuestAccept_npc_ranger_lilatha(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_ranger_lilatha(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_ESCAPE_FROM_THE_CATACOMBS)
     {
         creature->setFaction(113);
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp
index 9fdbd9617b3..90df77ac82e 100644
--- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp
+++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp
@@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI
     {
         DoScriptText(SAY_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(DATA_GRUULEVENT, DONE);
             pInstance->HandleGameObject(pInstance->GetData64(DATA_GRUULDOOR), true);         // Open the encounter door
@@ -217,7 +217,7 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI
                 if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
                     DoCast(target,SPELL_CAVE_IN);
 
-                if(m_uiCaveIn_StaticTimer >= 4000)
+                if (m_uiCaveIn_StaticTimer >= 4000)
                     m_uiCaveIn_StaticTimer -= 2000;
 
                     m_uiCaveIn_Timer = m_uiCaveIn_StaticTimer;
diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp
index 6b3b6d7b81a..0de7c624407 100644
--- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp
+++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp
@@ -67,7 +67,7 @@ EndScriptData */
 
 bool CheckAllBossDied(ScriptedInstance* pInstance, Creature* m_creature)
 {
-    if(!pInstance || !m_creature)
+    if (!pInstance || !m_creature)
         return false;
 
     uint64 MaulgarGUID = 0;
@@ -94,10 +94,10 @@ bool CheckAllBossDied(ScriptedInstance* pInstance, Creature* m_creature)
     Olm = (Unit::GetCreature((*m_creature), OlmGUID));
     Krosh = (Unit::GetCreature((*m_creature), KroshGUID));
 
-    if(!Maulgar || !Kiggler || !Blindeye || !Olm || !Krosh)
+    if (!Maulgar || !Kiggler || !Blindeye || !Olm || !Krosh)
         return false;
 
-    if(!Maulgar->isAlive() && !Kiggler->isAlive() && !Blindeye->isAlive() && !Olm->isAlive() && !Krosh->isAlive())
+    if (!Maulgar->isAlive() && !Kiggler->isAlive() && !Blindeye->isAlive() && !Olm->isAlive() && !Krosh->isAlive())
         return true;
 
     return false;
@@ -140,10 +140,10 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
         Creature *pCreature = NULL;
         for(uint8 i = 0; i < 4; ++i)
         {
-            if(Council[i])
+            if (Council[i])
             {
                 pCreature = (Unit::GetCreature((*m_creature), Council[i]));
-                if(pCreature && !pCreature->isAlive())
+                if (pCreature && !pCreature->isAlive())
                 {
                     pCreature->Respawn();
                     pCreature->AI()->EnterEvadeMode();
@@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
     {
         DoScriptText(SAY_DEATH, m_creature);
 
-        if(CheckAllBossDied(pInstance, m_creature))
+        if (CheckAllBossDied(pInstance, m_creature))
             pInstance->SetData(DATA_MAULGAREVENT, DONE);
     }
 
@@ -202,7 +202,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
 
     void StartEvent(Unit *who)
     {
-        if(!pInstance)
+        if (!pInstance)
             return;
 
         GetCouncil();
@@ -218,11 +218,11 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Only if not incombat check if the event is started
-        if(!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
+        if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
         {
             Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
 
-            if(target)
+            if (target)
             {
                 AttackStart(target);
                 GetCouncil();
@@ -230,11 +230,11 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //someone evaded!
-        if(pInstance && !pInstance->GetData(DATA_MAULGAREVENT))
+        if (pInstance && !pInstance->GetData(DATA_MAULGAREVENT))
         {
             EnterEvadeMode();
             return;
@@ -262,7 +262,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
         }else MightyBlow_Timer -= diff;
 
         //Entering Phase 2
-        if(!Phase2 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50)
+        if (!Phase2 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50)
         {
             Phase2 = true;
             DoScriptText(SAY_ENRAGE, m_creature);
@@ -272,10 +272,10 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
             m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0);
         }
 
-        if(Phase2)
+        if (Phase2)
         {
             //Charging_Timer
-            if(Charging_Timer < diff)
+            if (Charging_Timer < diff)
             {
                 Unit* target = NULL;
                 target = SelectUnit(SELECT_TARGET_RANDOM, 0);
@@ -288,7 +288,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
             }else Charging_Timer -= diff;
 
             //Intimidating Roar
-            if(Roar_Timer < diff)
+            if (Roar_Timer < diff)
             {
                 DoCast(m_creature, SPELL_ROAR);
                 Roar_Timer = 40000+(rand()%10000);
@@ -341,7 +341,7 @@ struct TRINITY_DLL_DECL boss_olm_the_summonerAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID());
             pInstance->SetData(DATA_MAULGAREVENT, IN_PROGRESS);
@@ -350,15 +350,15 @@ struct TRINITY_DLL_DECL boss_olm_the_summonerAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if(pInstance)
+        if (pInstance)
         {
             Creature *Maulgar = NULL;
             Maulgar = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_MAULGAR)));
 
-            if(Maulgar)
+            if (Maulgar)
                 CAST_AI(boss_high_king_maulgarAI, Maulgar->AI())->AddDeath();
 
-            if(CheckAllBossDied(pInstance, m_creature))
+            if (CheckAllBossDied(pInstance, m_creature))
                 pInstance->SetData(DATA_MAULGAREVENT, DONE);
         }
     }
@@ -366,47 +366,47 @@ struct TRINITY_DLL_DECL boss_olm_the_summonerAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Only if not incombat check if the event is started
-        if(!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
+        if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
         {
             Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
 
-            if(target)
+            if (target)
             {
                 AttackStart(target);
             }
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //someone evaded!
-        if(pInstance && !pInstance->GetData(DATA_MAULGAREVENT))
+        if (pInstance && !pInstance->GetData(DATA_MAULGAREVENT))
         {
             EnterEvadeMode();
             return;
         }
 
         //DarkDecay_Timer
-        if(DarkDecay_Timer < diff)
+        if (DarkDecay_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_DARK_DECAY);
             DarkDecay_Timer = 20000;
         }else DarkDecay_Timer -= diff;
 
         //Summon_Timer
-        if(Summon_Timer < diff)
+        if (Summon_Timer < diff)
         {
             DoCast(m_creature, SPELL_SUMMON_WFH);
             Summon_Timer = 30000;
         }else Summon_Timer -= diff;
 
         //DeathCoil Timer /need correct timer
-        if(DeathCoil_Timer < diff)
+        if (DeathCoil_Timer < diff)
         {
             Unit* target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-            if(target)
+            if (target)
                 DoCast(target, SPELL_DEATH_COIL);
             DeathCoil_Timer = 20000;
         }else DeathCoil_Timer -= diff;
@@ -445,7 +445,7 @@ struct TRINITY_DLL_DECL boss_kiggler_the_crazedAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID());
             pInstance->SetData(DATA_MAULGAREVENT, IN_PROGRESS);
@@ -454,15 +454,15 @@ struct TRINITY_DLL_DECL boss_kiggler_the_crazedAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if(pInstance)
+        if (pInstance)
         {
             Creature *Maulgar = NULL;
             Maulgar = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_MAULGAR)));
 
-            if(Maulgar)
+            if (Maulgar)
                 CAST_AI(boss_high_king_maulgarAI, Maulgar->AI())->AddDeath();
 
-            if(CheckAllBossDied(pInstance, m_creature))
+            if (CheckAllBossDied(pInstance, m_creature))
                 pInstance->SetData(DATA_MAULGAREVENT, DONE);
         }
     }
@@ -470,53 +470,53 @@ struct TRINITY_DLL_DECL boss_kiggler_the_crazedAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Only if not incombat check if the event is started
-        if(!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
+        if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
         {
             Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
 
-            if(target)
+            if (target)
             {
                 AttackStart(target);
             }
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //someone evaded!
-        if(pInstance && !pInstance->GetData(DATA_MAULGAREVENT))
+        if (pInstance && !pInstance->GetData(DATA_MAULGAREVENT))
         {
             EnterEvadeMode();
             return;
         }
 
         //GreaterPolymorph_Timer
-        if(GreaterPolymorph_Timer < diff)
+        if (GreaterPolymorph_Timer < diff)
         {
             Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-            if(target)
+            if (target)
                 DoCast(target, SPELL_GREATER_POLYMORPH);
 
             GreaterPolymorph_Timer = 15000 + rand()%5000;
         }else GreaterPolymorph_Timer -= diff;
 
         //LightningBolt_Timer
-        if(LightningBolt_Timer < diff)
+        if (LightningBolt_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_LIGHTNING_BOLT);
             LightningBolt_Timer = 15000;
         }else LightningBolt_Timer -= diff;
 
         //ArcaneShock_Timer
-        if(ArcaneShock_Timer < diff)
+        if (ArcaneShock_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_ARCANE_SHOCK);
             ArcaneShock_Timer = 20000;
         }else ArcaneShock_Timer -= diff;
 
         //ArcaneExplosion_Timer
-        if(ArcaneExplosion_Timer < diff)
+        if (ArcaneExplosion_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_ARCANE_EXPLOSION);
             ArcaneExplosion_Timer = 30000;
@@ -553,7 +553,7 @@ struct TRINITY_DLL_DECL boss_blindeye_the_seerAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID());
             pInstance->SetData(DATA_MAULGAREVENT, IN_PROGRESS);
@@ -562,15 +562,15 @@ struct TRINITY_DLL_DECL boss_blindeye_the_seerAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if(pInstance)
+        if (pInstance)
         {
             Creature *Maulgar = NULL;
             Maulgar = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_MAULGAR)));
 
-            if(Maulgar)
+            if (Maulgar)
                 CAST_AI(boss_high_king_maulgarAI, Maulgar->AI())->AddDeath();
 
-            if(CheckAllBossDied(pInstance, m_creature))
+            if (CheckAllBossDied(pInstance, m_creature))
                 pInstance->SetData(DATA_MAULGAREVENT, DONE);
         }
     }
@@ -578,36 +578,36 @@ struct TRINITY_DLL_DECL boss_blindeye_the_seerAI : public ScriptedAI
      void UpdateAI(const uint32 diff)
     {
         //Only if not incombat check if the event is started
-        if(!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
+        if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
         {
             Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
 
-            if(target)
+            if (target)
             {
                 AttackStart(target);
             }
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //someone evaded!
-        if(pInstance && !pInstance->GetData(DATA_MAULGAREVENT))
+        if (pInstance && !pInstance->GetData(DATA_MAULGAREVENT))
         {
             EnterEvadeMode();
             return;
         }
 
         //GreaterPowerWordShield_Timer
-        if(GreaterPowerWordShield_Timer < diff)
+        if (GreaterPowerWordShield_Timer < diff)
         {
             DoCast(m_creature, SPELL_GREATER_PW_SHIELD);
             GreaterPowerWordShield_Timer = 40000;
         }else GreaterPowerWordShield_Timer -= diff;
 
         //Heal_Timer
-        if(Heal_Timer < diff)
+        if (Heal_Timer < diff)
         {
             DoCast(m_creature, SPELL_HEAL);
             Heal_Timer = 15000 + rand()%25000;
@@ -651,7 +651,7 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID());
             pInstance->SetData(DATA_MAULGAREVENT, IN_PROGRESS);
@@ -660,15 +660,15 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if(pInstance)
+        if (pInstance)
         {
             Creature *Maulgar = NULL;
             Maulgar = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_MAULGAR)));
 
-            if(Maulgar)
+            if (Maulgar)
                 CAST_AI(boss_high_king_maulgarAI, Maulgar->AI())->AddDeath();
 
-            if(CheckAllBossDied(pInstance, m_creature))
+            if (CheckAllBossDied(pInstance, m_creature))
                 pInstance->SetData(DATA_MAULGAREVENT, DONE);
         }
     }
@@ -676,36 +676,36 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Only if not incombat check if the event is started
-        if(!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
+        if (!m_creature->isInCombat() && pInstance && pInstance->GetData(DATA_MAULGAREVENT))
         {
             Unit* target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_MAULGAREVENT_TANK));
 
-            if(target)
+            if (target)
             {
                 AttackStart(target);
             }
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //someone evaded!
-        if(pInstance && !pInstance->GetData(DATA_MAULGAREVENT))
+        if (pInstance && !pInstance->GetData(DATA_MAULGAREVENT))
         {
             EnterEvadeMode();
             return;
         }
 
         //GreaterFireball_Timer
-        if(GreaterFireball_Timer < diff || m_creature->IsWithinDist(m_creature->getVictim(), 30))
+        if (GreaterFireball_Timer < diff || m_creature->IsWithinDist(m_creature->getVictim(), 30))
         {
             DoCast(m_creature->getVictim(), SPELL_GREATER_FIREBALL);
             GreaterFireball_Timer = 2000;
         }else GreaterFireball_Timer -= diff;
 
         //SpellShield_Timer
-        if(SpellShield_Timer < diff)
+        if (SpellShield_Timer < diff)
         {
             m_creature->InterruptNonMeleeSpells(false);
             DoCast(m_creature->getVictim(), SPELL_SPELLSHIELD);
@@ -713,7 +713,7 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI
         }else SpellShield_Timer -= diff;
 
         //BlastWave_Timer
-        if(BlastWave_Timer < diff)
+        if (BlastWave_Timer < diff)
         {
             Unit *target;
             std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
@@ -722,11 +722,11 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI
             {
                 target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
                                                             //15 yard radius minimum
-                if(target && target->IsWithinDist(m_creature, 15,false))
+                if (target && target->IsWithinDist(m_creature, 15,false))
                     target_list.push_back(target);
                 target = NULL;
             }
-            if(target_list.size())
+            if (target_list.size())
                 target = *(target_list.begin()+rand()%target_list.size());
 
             m_creature->InterruptNonMeleeSpells(false);
diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp
index a549abd742d..c72a0af1276 100644
--- a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp
+++ b/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp
@@ -33,7 +33,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
 {
-    instance_gruuls_lair(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_gruuls_lair(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounters[ENCOUNTERS];
 
@@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS) return true;
+            if (Encounters[i] == IN_PROGRESS) return true;
 
         return false;
     }
@@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
         {
             case 184468:
                 MaulgarDoor = go->GetGUID();
-                if(Encounters[0] == DONE) HandleGameObject(NULL, true, go);
+                if (Encounters[0] == DONE) HandleGameObject(NULL, true, go);
                 break;
             case 184662: GruulDoor = go->GetGUID(); break;
         }
@@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
 
     void SetData64(uint32 type, uint64 data)
     {
-        if(type == DATA_MAULGAREVENT_TANK)
+        if (type == DATA_MAULGAREVENT_TANK)
             MaulgarEvent_Tank = data;
     }
 
@@ -122,15 +122,15 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
         switch(type)
         {
             case DATA_MAULGAREVENT:
-                if(data == DONE) HandleGameObject(MaulgarDoor, true);
+                if (data == DONE) HandleGameObject(MaulgarDoor, true);
                 Encounters[0] = data; break;
             case DATA_GRUULEVENT:
-                if(data == IN_PROGRESS) HandleGameObject(GruulDoor, false);
+                if (data == IN_PROGRESS) HandleGameObject(GruulDoor, false);
                 else HandleGameObject(GruulDoor, true);
                 Encounters[1] = data; break;
         }
 
-        if(data == DONE)
+        if (data == DONE)
             SaveToDB();
     }
 
@@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
         stream << Encounters[0] << " " << Encounters[1];
         char* out = new char[stream.str().length() + 1];
         strcpy(out, stream.str().c_str());
-        if(out)
+        if (out)
         {
             OUT_SAVE_INST_DATA_COMPLETE;
             return out;
@@ -162,7 +162,7 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
 
     void Load(const char* in)
     {
-        if(!in)
+        if (!in)
         {
             OUT_LOAD_INST_DATA_FAIL;
             return;
@@ -172,15 +172,15 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
         std::istringstream stream(in);
         stream >> Encounters[0] >> Encounters[1];
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS)                // Do not load an encounter as "In Progress" - reset it instead.
+            if (Encounters[i] == IN_PROGRESS)                // Do not load an encounter as "In Progress" - reset it instead.
                 Encounters[i] = NOT_STARTED;
         OUT_LOAD_INST_DATA_COMPLETE;
     }
 };
 
-InstanceData* GetInstanceData_instance_gruuls_lair(Map* map)
+InstanceData* GetInstanceData_instance_gruuls_lair(Map* pMap)
 {
-    return new instance_gruuls_lair(map);
+    return new instance_gruuls_lair(pMap);
 }
 
 void AddSC_instance_gruuls_lair()
diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp
index 40bf428da91..e18bfa63b7c 100644
--- a/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp
+++ b/src/bindings/scripts/scripts/zone/gundrak/boss_drakkari_colossus.cpp
@@ -29,7 +29,7 @@ struct TRINITY_DLL_DECL boss_drakkari_colossusAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         phase =1;
diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp
index 7decc3d6b28..ae0376649b0 100644
--- a/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp
+++ b/src/bindings/scripts/scripts/zone/gundrak/boss_eck.cpp
@@ -35,10 +35,10 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(berserk < diff)
+        if (berserk < diff)
         {
             DoCast(m_creature,SPELL_ECK_BERSERK);
             berserk = 120000;
diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp
index 0f34d019e6a..5256fcc8730 100644
--- a/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp
+++ b/src/bindings/scripts/scripts/zone/gundrak/boss_gal_darah.cpp
@@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_gal_darahAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp
index f9e8b41a427..0e1df4b35d0 100644
--- a/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp
+++ b/src/bindings/scripts/scripts/zone/gundrak/boss_moorabi.cpp
@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI
     {
         phase =1;
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp b/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp
index f001626568f..592a1959cd0 100644
--- a/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp
+++ b/src/bindings/scripts/scripts/zone/gundrak/boss_slad_ran.cpp
@@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_slad_ranAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 30)
diff --git a/src/bindings/scripts/scripts/zone/gundrak/instance_gundrak.cpp b/src/bindings/scripts/scripts/zone/gundrak/instance_gundrak.cpp
index 3e5b59c0930..0ed874d905f 100644
--- a/src/bindings/scripts/scripts/zone/gundrak/instance_gundrak.cpp
+++ b/src/bindings/scripts/scripts/zone/gundrak/instance_gundrak.cpp
@@ -3,12 +3,12 @@
 
 struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance
 {
-    instance_gundrak(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_gundrak(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 };
 
-InstanceData* GetInstanceData_instance_gundrak(Map* map)
+InstanceData* GetInstanceData_instance_gundrak(Map* pMap)
 {
-    return new instance_gundrak(map);
+    return new instance_gundrak(pMap);
 }
 
 void AddSC_instance_gundrak()
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp
index f383a52942e..beda1f0f2fe 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp
@@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI
         AcidSpray_Timer = 10000;
         PoisonSpawn_Timer = 5000;
         PoisonBolt_Timer = 7000;
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(TYPE_BROGGOK_EVENT, NOT_STARTED);
             pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), true);
@@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI
     void EnterCombat(Unit *who)
     {
         DoScriptText(SAY_AGGRO, m_creature);
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(TYPE_BROGGOK_EVENT, IN_PROGRESS);
             pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), false);
@@ -80,7 +80,7 @@ struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (AcidSpray_Timer < diff)
@@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI
     
     void JustDied(Unit* who)
     {   
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR4), true);
             pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR5), true);
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
index 18b8aff72a0..878fa6f61ee 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
@@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
         Firenova = false;
         addYell = false;
         SummonChannelers();
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, NOT_STARTED);
     }
    
@@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
         if (m_creature->IsNonMeleeSpellCasted(false))
             m_creature->InterruptNonMeleeSpells(true);
         DoStartMovement(who);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, IN_PROGRESS);
     }
 
@@ -124,7 +124,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
 
     void ChannelerEngaged(Unit* who)
     {
-        if(who && !addYell)
+        if (who && !addYell)
         {
             addYell = true;
             switch(rand()%3)
@@ -137,7 +137,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
         for(uint8 i=0; i<5; ++i)
         {
             Creature *channeler = Unit::GetCreature(*m_creature, Channelers[i]);
-            if(who && channeler && !channeler->isInCombat())
+            if (who && channeler && !channeler->isInCombat())
                 channeler->AI()->AttackStart(who);
         }
     }
@@ -147,23 +147,23 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
         for(uint8 i=0; i<5; ++i)
         {
             Creature *channeler = Unit::GetCreature(*m_creature, Channelers[i]);
-            if(channeler && channeler->isAlive())
+            if (channeler && channeler->isAlive())
                 return;
         }
 
-        if(killer)
+        if (killer)
             m_creature->AI()->AttackStart(killer);
     }
 
     uint64 GetChanneled(Creature *channeler1)
     {
         SummonChannelers();
-        if(!channeler1) return NULL;
+        if (!channeler1) return NULL;
         uint8 i;
         for(i=0; i<5; ++i)
         {
             Creature *channeler = Unit::GetCreature(*m_creature, Channelers[i]);
-            if(channeler && channeler->GetGUID() == channeler1->GetGUID())
+            if (channeler && channeler->GetGUID() == channeler1->GetGUID())
                 break;
         }
         return Channelers[(i+2)%5];
@@ -174,9 +174,9 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
         for(uint8 i=0; i<5; ++i)
         {
             Creature *channeler = Unit::GetCreature(*m_creature, Channelers[i]);
-            if(!channeler || channeler->isDead())
+            if (!channeler || channeler->isDead())
                 channeler = m_creature->SummonCreature(ENTRY_CHANNELER,ShadowmoonChannelers[i][0],ShadowmoonChannelers[i][1],ShadowmoonChannelers[i][2],ShadowmoonChannelers[i][3],TEMPSUMMON_CORPSE_TIMED_DESPAWN,300000);
-            if(channeler)
+            if (channeler)
                 Channelers[i] = channeler->GetGUID();
             else
                 Channelers[i] = 0;
@@ -187,7 +187,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
     {
         DoScriptText(SAY_DIE, m_creature);
 
-        if(!pInstance)
+        if (!pInstance)
             return;
             
         pInstance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, DONE);
@@ -199,7 +199,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
     {
         if (!UpdateVictim())
         {
-            if(check_Timer < diff)
+            if (check_Timer < diff)
             {
                 if (!m_creature->IsNonMeleeSpellCasted(false))
                     DoCast(m_creature,SPELL_EVOCATION);
@@ -239,7 +239,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
 
             DoScriptText(SAY_NOVA, m_creature);
 
-            if(SpellEntry *nova = GET_SPELL(SPELL_BURNING_NOVA))
+            if (SpellEntry *nova = GET_SPELL(SPELL_BURNING_NOVA))
             {
                 uint8 eff_mask=0;
                 for (int i=0; i<3; ++i)
@@ -308,7 +308,7 @@ struct TRINITY_DLL_DECL mob_shadowmoon_channelerAI : public ScriptedAI
 
     void EnterCombat(Unit* who)
     {
-        if(Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
+        if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
             CAST_AI(boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerEngaged(who);
         if (m_creature->IsNonMeleeSpellCasted(false))
             m_creature->InterruptNonMeleeSpells(true);
@@ -317,7 +317,7 @@ struct TRINITY_DLL_DECL mob_shadowmoon_channelerAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-       if(Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
+       if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
            CAST_AI(boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerDied(Killer);
     }
 
@@ -325,13 +325,13 @@ struct TRINITY_DLL_DECL mob_shadowmoon_channelerAI : public ScriptedAI
     {
         if (!UpdateVictim())
         {
-            if(check_Timer < diff)
+            if (check_Timer < diff)
             {
                 if (!m_creature->IsNonMeleeSpellCasted(false))
-                    if(Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
+                    if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
                     {
                         uint64 channeler = CAST_AI(boss_kelidan_the_breakerAI, Kelidan->AI())->GetChanneled(m_creature);
-                        if(Unit *channeled = Unit::GetUnit(*m_creature, channeler))
+                        if (Unit *channeled = Unit::GetUnit(*m_creature, channeler))
                             DoCast(channeled,SPELL_CHANNELING);
                     }
                 check_Timer = 5000;
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp
index a48c22c4a17..0a23f275c35 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp
@@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI
         Domination_Timer = 120000;
         Knockdown_Timer = 10000;
 
-        if(!pInstance)
+        if (!pInstance)
             return;
             
         pInstance->SetData(TYPE_THE_MAKER_EVENT, NOT_STARTED);
@@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI
             case 2: DoScriptText(SAY_AGGRO_3, m_creature); break;
         }
         
-        if(!pInstance)
+        if (!pInstance)
             return;
             
         pInstance->SetData(TYPE_THE_MAKER_EVENT, IN_PROGRESS);
@@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI
     {
         DoScriptText(SAY_DIE, m_creature);
         
-        if(!pInstance)
+        if (!pInstance)
             return;
             
         pInstance->SetData(TYPE_THE_MAKER_EVENT, DONE);
@@ -125,7 +125,7 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI
         }else ExplodingBreaker_Timer -=diff;
 
         /* // Disabled until Core Support for mind control
-        if(domination_timer_timer < diff)
+        if (domination_timer_timer < diff)
         {
         Unit* target;
         target = SelectUnit(SELECT_TARGET_RANDOM,0);
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
index e28056a92ed..d9d7bbb3758 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
@@ -30,7 +30,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance
 {
-    instance_blood_furnace(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_blood_furnace(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint64 The_MakerGUID;
     uint64 BroggokGUID;
@@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance
 
     void OnCreatureCreate(Creature *creature, bool add)
     {
-        if(!add)
+        if (!add)
             return;
 
         switch(creature->GetEntry())
@@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance
 
     void OnGameObjectCreate(GameObject *go, bool add)
     {
-        if(!add)
+        if (!add)
             return;
 
      if (go->GetEntry() == 181766)                //Final exit door
@@ -219,9 +219,9 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance
 };
 
 
-InstanceData* GetInstanceData_instance_blood_furnace(Map* map)
+InstanceData* GetInstanceData_instance_blood_furnace(Map* pMap)
 {
-    return new instance_blood_furnace(map);
+    return new instance_blood_furnace(pMap);
 }
 
 void AddSC_instance_blood_furnace()
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
index fbb9aaaf673..0dbc172c767 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
@@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI
     uint32 Shadowbolt_Timer;
     uint32 Summon_Timer;
     uint32 SummonedCount;
-    uint64 playerGUID;
+    uint64 PlayerGUID;
     bool CanPullBack;
 
     void Reset()
@@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI
         Shadowbolt_Timer = 2000;
         Summon_Timer = 10000;
         SummonedCount = 0;
-        playerGUID = 0;
+        PlayerGUID = 0;
         CanPullBack = false;
     }
 
@@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI
         {
             if (ShadowWhip_Timer < diff)
             {
-                if (Player* temp = Unit::GetPlayer(playerGUID))
+                if (Player* temp = Unit::GetPlayer(PlayerGUID))
                 {
                     //if unit dosen't have this flag, then no pulling back (script will attempt cast, even if orbital strike was resisted)
                     if (temp->HasUnitMovementFlag(MOVEMENTFLAG_FALLING))
@@ -138,7 +138,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI
                         DoCast(temp,SPELL_SHADOW_WHIP);
                     }
                 }
-                playerGUID = 0;
+                PlayerGUID = 0;
                 ShadowWhip_Timer = 2000;
                 CanPullBack = false;
             }else ShadowWhip_Timer -= diff;
@@ -154,9 +154,9 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI
             {
                 DoCast(temp,SPELL_ORBITAL_STRIKE);
                 OrbitalStrike_Timer = 14000+rand()%2000;
-                playerGUID = temp->GetGUID();
+                PlayerGUID = temp->GetGUID();
 
-                if (playerGUID)
+                if (PlayerGUID)
                     CanPullBack = true;
             }
         }else OrbitalStrike_Timer -= diff;
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
index fd0c42b5a81..abd06dcccba 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
@@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI
 
     void JustSummoned(Creature *summoned)
     {
-        if(summoned && summoned->GetEntry() == ENTRY_LIQUID_FIRE)
+        if (summoned && summoned->GetEntry() == ENTRY_LIQUID_FIRE)
         {
             summoned->SetLevel(m_creature->getLevel());
             summoned->setFaction(m_creature->getFaction());
@@ -100,7 +100,7 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI
 
     void SpellHitTarget(Unit* target, const SpellEntry* entry)
     {
-        if(target && entry->Id == SPELL_FIREBALL)
+        if (target && entry->Id == SPELL_FIREBALL)
             m_creature->SummonCreature(ENTRY_LIQUID_FIRE,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),target->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,30000);
     }
 
@@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI
     {
         if (!UpdateVictim())
         {
-            if(UnsummonCheck < diff && m_creature->isAlive())
+            if (UnsummonCheck < diff && m_creature->isAlive())
             {
                 m_creature->SetLootRecipient(NULL);
                 m_creature->SetVisibility(VISIBILITY_OFF);
@@ -118,17 +118,17 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI
             return;
         }
 
-        if(Fireball_Timer < diff)
+        if (Fireball_Timer < diff)
         {
-            if(Unit *victim = SelectUnit(SELECT_TARGET_RANDOM,0))
+            if (Unit *victim = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(victim, SPELL_FIREBALL,true);
             Fireball_Timer = 4000+rand()%3000;
         }else Fireball_Timer -= diff;
 
-        if(flight) // phase 1 - the flight
+        if (flight) // phase 1 - the flight
         {
             Creature *Vazruden = Unit::GetCreature(*m_creature,VazrudenGUID);
-            if(Fly_Timer < diff || !(Vazruden && Vazruden->isAlive() && (Vazruden->GetHealth()*5 > Vazruden->GetMaxHealth())))
+            if (Fly_Timer < diff || !(Vazruden && Vazruden->isAlive() && (Vazruden->GetHealth()*5 > Vazruden->GetMaxHealth())))
             {
                 flight = false;
                 BellowingRoar_Timer = 6000;
@@ -136,31 +136,31 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI
                 m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
                 m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
                 m_creature->GetMotionMaster()->Clear();
-                if(Unit *victim = SelectUnit(SELECT_TARGET_NEAREST,0))
+                if (Unit *victim = SelectUnit(SELECT_TARGET_NEAREST,0))
                     m_creature->AI()->AttackStart(victim);
                 DoStartMovement(m_creature->getVictim());
                 DoScriptText(EMOTE, m_creature);
                 return;
             }else Fly_Timer -= diff;
 
-            if(Turn_Timer < diff)
+            if (Turn_Timer < diff)
             {
                 uint32 waypoint = (Fly_Timer/10000)%2;
-                if(m_creature->IsWithinDist3d(VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2], 5))
+                if (m_creature->IsWithinDist3d(VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2], 5))
                     m_creature->GetMotionMaster()->MovePoint(0,VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2]);
                 Turn_Timer = 10000;
             }else Turn_Timer -= diff;
         }
         else // phase 2 - land fight
         {
-            if(ConeOfFire_Timer < diff)
+            if (ConeOfFire_Timer < diff)
             {
                 DoCast(m_creature, SPELL_CONE_OF_FIRE);
                 ConeOfFire_Timer = 12000;
                 Fireball_Timer = 4000;
             }else ConeOfFire_Timer -= diff;
 
-            if(HeroicMode && BellowingRoar_Timer < diff)
+            if (HeroicMode && BellowingRoar_Timer < diff)
             {
                 DoCast(m_creature, SPELL_BELLOWING_ROAR);
                 BellowingRoar_Timer = 45000;
@@ -202,7 +202,7 @@ struct TRINITY_DLL_DECL boss_vazrudenAI : public ScriptedAI
 
     void KilledUnit(Unit* who)
     {
-        if(who && who->GetEntry()!=ENTRY_VAZRUDEN)
+        if (who && who->GetEntry()!=ENTRY_VAZRUDEN)
             switch(rand()%2)
             {
                 case 0: DoScriptText(SAY_KILL_1, m_creature); break;
@@ -212,7 +212,7 @@ struct TRINITY_DLL_DECL boss_vazrudenAI : public ScriptedAI
 
     void JustDied(Unit* who)
     {
-        if(who && who != m_creature)
+        if (who && who != m_creature)
             DoScriptText(SAY_DIE, m_creature);
     }
 
@@ -220,9 +220,9 @@ struct TRINITY_DLL_DECL boss_vazrudenAI : public ScriptedAI
     {
         if (!UpdateVictim())
         {
-            if(UnsummonCheck < diff && m_creature->isAlive())
+            if (UnsummonCheck < diff && m_creature->isAlive())
             {
-                if(!WipeSaid)
+                if (!WipeSaid)
                 {
                     DoScriptText(SAY_WIPE, m_creature);
                     WipeSaid = true;
@@ -235,9 +235,9 @@ struct TRINITY_DLL_DECL boss_vazrudenAI : public ScriptedAI
             return;
         }
 
-        if(Revenge_Timer < diff)
+        if (Revenge_Timer < diff)
         {
-            if(Unit *victim = m_creature->getVictim())
+            if (Unit *victim = m_creature->getVictim())
                 DoCast(victim, SPELL_REVENGE);
             Revenge_Timer = 5000;
         }else Revenge_Timer -= diff;
@@ -277,11 +277,11 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI
 
     void UnsummonAdds()
     {
-        if(summoned)
+        if (summoned)
         {
             Creature *Nazan = Unit::GetCreature(*m_creature, NazanGUID);
             Creature *Vazruden = Unit::GetCreature(*m_creature, VazrudenGUID);
-            if(Nazan || (Nazan = me->FindNearestCreature(ENTRY_NAZAN, 5000)))
+            if (Nazan || (Nazan = me->FindNearestCreature(ENTRY_NAZAN, 5000)))
             {
                 Nazan->SetLootRecipient(NULL);
                 Nazan->SetVisibility(VISIBILITY_OFF);
@@ -289,7 +289,7 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI
                 Nazan->RemoveCorpse();
                 NazanGUID = 0;
             }
-            if(Vazruden || (Vazruden = me->FindNearestCreature(ENTRY_VAZRUDEN, 5000)))
+            if (Vazruden || (Vazruden = me->FindNearestCreature(ENTRY_VAZRUDEN, 5000)))
             {
                 Vazruden->SetLootRecipient(NULL);
                 Vazruden->SetVisibility(VISIBILITY_OFF);
@@ -305,13 +305,13 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI
 
     void SummonAdds()
     {
-        if(!summoned)
+        if (!summoned)
         {
             Creature* Vazruden = m_creature->SummonCreature(ENTRY_VAZRUDEN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000);
-            if(Vazruden)
+            if (Vazruden)
                 VazrudenGUID = Vazruden->GetGUID();
             Creature* Nazan = m_creature->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000);
-            if(Nazan)
+            if (Nazan)
                 NazanGUID = Nazan->GetGUID();
             summoned = true;
             m_creature->SetVisibility(VISIBILITY_OFF);
@@ -321,7 +321,7 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(phase==0)
+        if (phase==0)
         {
             phase = 1;
             check = 0;
@@ -331,23 +331,23 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI
 
     void JustSummoned(Creature *summoned)
     {
-        if(!summoned) return;
+        if (!summoned) return;
         Unit *victim = m_creature->getVictim();
-        if(summoned->GetEntry() == ENTRY_NAZAN)
+        if (summoned->GetEntry() == ENTRY_NAZAN)
         {
             CAST_AI(boss_nazanAI, summoned->AI())->VazrudenGUID = VazrudenGUID;
             summoned->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
             summoned->SetSpeed(MOVE_FLIGHT, 2.5);
-            if(victim)
+            if (victim)
                 AttackStartNoMove(victim);
         }
-        else if(victim)
+        else if (victim)
             summoned->AI()->AttackStart(victim);
     }
 
     void SentryDownBy(Unit* killer)
     {
-        if(sentryDown)
+        if (sentryDown)
         {
             AttackStartNoMove(killer);
             sentryDown = false;
@@ -364,9 +364,9 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI
             return;
             break;
         case 1: // go to the middle and begin the fight
-            if(check < diff)
+            if (check < diff)
             {
-                if(!m_creature->IsWithinDist3d(VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],5))
+                if (!m_creature->IsWithinDist3d(VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],5))
                 {
                     m_creature->GetMotionMaster()->Clear();
                     m_creature->GetMotionMaster()->MovePoint(0,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2]);
@@ -381,13 +381,13 @@ struct TRINITY_DLL_DECL boss_vazruden_the_heraldAI : public ScriptedAI
             }else check -= diff;
             break;
         default: // adds do the job now
-            if(check < diff)
+            if (check < diff)
             {
                 Creature *Nazan = Unit::GetCreature(*m_creature, NazanGUID);
                 Creature *Vazruden = Unit::GetCreature(*m_creature, VazrudenGUID);
-                if(Nazan && Nazan->isAlive() || Vazruden && Vazruden->isAlive())
+                if (Nazan && Nazan->isAlive() || Vazruden && Vazruden->isAlive())
                 {
-                    if(Nazan && Nazan->getVictim() || Vazruden && Vazruden->getVictim())
+                    if (Nazan && Nazan->getVictim() || Vazruden && Vazruden->getVictim())
                         return;
                     else
                     {
@@ -423,7 +423,7 @@ struct TRINITY_DLL_DECL mob_hellfire_sentryAI : public ScriptedAI
 
     void JustDied(Unit* who)
     {
-        if(Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD,150))
+        if (Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD,150))
             CAST_AI(boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(who);
     }
 
@@ -432,9 +432,9 @@ struct TRINITY_DLL_DECL mob_hellfire_sentryAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(KidneyShot_Timer < diff)
+        if (KidneyShot_Timer < diff)
         {
-            if(Unit *victim = m_creature->getVictim())
+            if (Unit *victim = m_creature->getVictim())
                 DoCast(victim, SPELL_KIDNEY_SHOT);
             KidneyShot_Timer = 20000;
         }else KidneyShot_Timer -= diff;
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
index c36f963555c..9a2d6ce1b85 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
@@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_watchkeeper_gargolmarAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit* who)
     {
-        if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
+        if (!m_creature->getVictim() && who->isTargetableForAttack() && (m_creature->IsHostileTo(who)) && who->isInAccessiblePlaceFor(m_creature))
         {
             if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
                 return;
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
index d7118f039a7..d412da15d0b 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
@@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI
 
     void SpellHit(Unit*, const SpellEntry *spell)
     {
-        if(trigger == 2 && spell->Id == SPELL_BLAZE_TARGET)
+        if (trigger == 2 && spell->Id == SPELL_BLAZE_TARGET)
         {
             m_creature->CastSpell(m_creature, SPELL_BLAZE_TRAP, true);
             m_creature->SetVisibility(VISIBILITY_OFF);
@@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI
     {
         trigger = _trigger;
         m_creature->SetDisplayId(11686);
-        if(trigger == 1) //debris
+        if (trigger == 1) //debris
         {
             m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             m_creature->CastSpell(m_creature, SPELL_DEBRIS_VISUAL, true);
@@ -129,16 +129,16 @@ struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI
     }
 
     void EnterCombat(Unit* who) {DoZoneInCombat();}
-    void AttackStart(Unit *who) {if(!trigger) ScriptedAI::AttackStart(who);}
-    void MoveInLineOfSight(Unit *who) {if(!trigger) ScriptedAI::MoveInLineOfSight(who);}
+    void AttackStart(Unit *who) {if (!trigger) ScriptedAI::AttackStart(who);}
+    void MoveInLineOfSight(Unit *who) {if (!trigger) ScriptedAI::MoveInLineOfSight(who);}
 
     void UpdateAI(const uint32 diff)
     {
-        if(trigger)
+        if (trigger)
         {
-            if(trigger == 1)
+            if (trigger == 1)
             {
-                if(FireBlast_Timer < diff)
+                if (FireBlast_Timer < diff)
                 {
                     m_creature->CastSpell(m_creature, SPELL_DEBRIS_DAMAGE, true);
                     trigger = 3;
@@ -147,15 +147,15 @@ struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI
             return;
         }
 
-        if(Despawn_Timer < diff)
+        if (Despawn_Timer < diff)
         {
             m_creature->ForcedDespawn();
         }else Despawn_Timer -= diff;
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(FireBlast_Timer < diff)
+        if (FireBlast_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_FIRE_BLAST);
             FireBlast_Timer = 5000+rand()%10000;
@@ -176,13 +176,13 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
         // target 7, random target with certain entry spell, need core fix
         SpellEntry *TempSpell;
         TempSpell = GET_SPELL(SPELL_BLAZE_TARGET);
-        if(TempSpell && TempSpell->EffectImplicitTargetA[0] != 6)
+        if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 6)
         {
             TempSpell->EffectImplicitTargetA[0] = 6;
             TempSpell->EffectImplicitTargetB[0] = 0;
         }
         TempSpell = GET_SPELL(SPELL_QUAKE_TRIGGER);
-        if(TempSpell && TempSpell->EffectTriggerSpell[0] != SPELL_QUAKE_KNOCKBACK)
+        if (TempSpell && TempSpell->EffectTriggerSpell[0] != SPELL_QUAKE_KNOCKBACK)
         {
             TempSpell->EffectTriggerSpell[0] = SPELL_QUAKE_KNOCKBACK;
         }
@@ -205,7 +205,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(DATA_MAGTHERIDON_EVENT, NOT_STARTED);
             pInstance->SetData(DATA_COLLAPSE, false);
@@ -232,7 +232,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
     void SetClicker(uint64 cubeGUID, uint64 clickerGUID)
     {
         // to avoid multiclicks from 1 cube
-        if(uint64 guid = Cube[cubeGUID])
+        if (uint64 guid = Cube[cubeGUID])
             DebuffClicker(Unit::GetUnit(*m_creature, guid));
         Cube[cubeGUID] = clickerGUID;
         NeedCheckCube = true;
@@ -241,7 +241,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
     //function to interrupt channeling and debuff clicker with mind exh(used if second person clicks with same cube or after dispeling/ending shadow grasp DoT)
     void DebuffClicker(Unit *clicker)
     {
-        if(!clicker || !clicker->isAlive())
+        if (!clicker || !clicker->isAlive())
             return;
 
         clicker->RemoveAurasDueToSpell(SPELL_SHADOW_GRASP); // cannot interrupt triggered spells
@@ -257,7 +257,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
         for(CubeMap::iterator i = Cube.begin(); i != Cube.end(); ++i)
         {
             Unit *clicker = Unit::GetUnit(*m_creature, (*i).second);
-            if(!clicker || !clicker->HasAura(SPELL_SHADOW_GRASP))
+            if (!clicker || !clicker->HasAura(SPELL_SHADOW_GRASP))
             {
                 DebuffClicker(clicker);
                 (*i).second = 0;
@@ -265,15 +265,15 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
         }
 
         // if 5 clickers from other cubes apply shadow cage
-        if(ClickerNum >= CLICKERS_COUNT && !m_creature->HasAura(SPELL_SHADOW_CAGE))
+        if (ClickerNum >= CLICKERS_COUNT && !m_creature->HasAura(SPELL_SHADOW_CAGE))
         {
             DoScriptText(SAY_BANISH, m_creature);
             m_creature->CastSpell(m_creature, SPELL_SHADOW_CAGE, true);
         }
-        else if(ClickerNum < CLICKERS_COUNT && m_creature->HasAura(SPELL_SHADOW_CAGE))
+        else if (ClickerNum < CLICKERS_COUNT && m_creature->HasAura(SPELL_SHADOW_CAGE))
             m_creature->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE);
 
-        if(!ClickerNum) NeedCheckCube = false;
+        if (!ClickerNum) NeedCheckCube = false;
     }
 
     void KilledUnit(Unit* victim)
@@ -283,7 +283,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_MAGTHERIDON_EVENT, DONE);
 
         DoScriptText(SAY_DEATH, m_creature);
@@ -293,13 +293,13 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
 
     void AttackStart(Unit *who)
     {
-        if(!m_creature->hasUnitState(UNIT_STAT_STUNNED))
+        if (!m_creature->hasUnitState(UNIT_STAT_STUNNED))
             ScriptedAI::AttackStart(who);
     }
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS);
         DoZoneInCombat();
 
@@ -320,28 +320,28 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
             }else RandChat_Timer -= diff;
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(NeedCheckCube) NeedCheckCubeStatus();
+        if (NeedCheckCube) NeedCheckCubeStatus();
 
-        if(Berserk_Timer < diff)
+        if (Berserk_Timer < diff)
         {
             m_creature->CastSpell(m_creature, SPELL_BERSERK, true);
             DoScriptText(EMOTE_BERSERK, m_creature);
             Berserk_Timer = 60000;
         }else Berserk_Timer -= diff;
 
-        if(Cleave_Timer < diff)
+        if (Cleave_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_CLEAVE);
             Cleave_Timer = 10000;
         }else Cleave_Timer -= diff;
 
-        if(BlastNova_Timer < diff)
+        if (BlastNova_Timer < diff)
         {
             // to avoid earthquake interruption
-            if(!m_creature->hasUnitState(UNIT_STAT_STUNNED))
+            if (!m_creature->hasUnitState(UNIT_STAT_STUNNED))
             {
                 DoScriptText(EMOTE_BLASTNOVA, m_creature);
                 DoCast(m_creature, SPELL_BLASTNOVA);
@@ -349,24 +349,24 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
             }
         }else BlastNova_Timer -= diff;
 
-        if(Quake_Timer < diff)
+        if (Quake_Timer < diff)
         {
             // to avoid blastnova interruption
-            if(!m_creature->IsNonMeleeSpellCasted(false))
+            if (!m_creature->IsNonMeleeSpellCasted(false))
             {
                 m_creature->CastSpell(m_creature, SPELL_QUAKE_TRIGGER, true);
                 Quake_Timer = 50000;
             }
         }else Quake_Timer -= diff;
 
-        if(Blaze_Timer < diff)
+        if (Blaze_Timer < diff)
         {
-            if(Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
                 float x, y, z;
                 target->GetPosition(x, y, z);
                 Creature *summon = m_creature->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
-                if(summon)
+                if (summon)
                 {
                     CAST_AI(mob_abyssalAI, summon->AI())->SetTrigger(2);
                     m_creature->CastSpell(summon, SPELL_BLAZE_TARGET, true);
@@ -376,7 +376,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
             Blaze_Timer = 20000 + rand()%20000;
         }else Blaze_Timer -= diff;
 
-        if(!Phase3 && m_creature->GetHealth()*10 < m_creature->GetMaxHealth()*3
+        if (!Phase3 && m_creature->GetHealth()*10 < m_creature->GetMaxHealth()*3
             && !m_creature->IsNonMeleeSpellCasted(false) // blast nova
             && !m_creature->hasUnitState(UNIT_STAT_STUNNED)) // shadow cage and earthquake
         {
@@ -385,20 +385,20 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
             m_creature->CastSpell(m_creature, SPELL_CAMERA_SHAKE, true);
             m_creature->CastSpell(m_creature, SPELL_DEBRIS_KNOCKDOWN, true);
 
-            if(pInstance)
+            if (pInstance)
                 pInstance->SetData(DATA_COLLAPSE, true);
         }
 
-        if(Phase3)
+        if (Phase3)
         {
-            if(Debris_Timer < diff)
+            if (Debris_Timer < diff)
             {
-                if(Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 {
                     float x, y, z;
                     target->GetPosition(x, y, z);
                     Creature *summon = m_creature->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
-                    if(summon) CAST_AI(mob_abyssalAI, summon->AI())->SetTrigger(1);
+                    if (summon) CAST_AI(mob_abyssalAI, summon->AI())->SetTrigger(1);
                 }
                 Debris_Timer = 10000;
             }else Debris_Timer -= diff;
@@ -433,7 +433,7 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI
 
         Check_Timer = 5000;
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_CHANNELER_EVENT, NOT_STARTED);
 
         m_creature->CastSpell(m_creature, SPELL_SHADOW_GRASP_C, false);
@@ -441,7 +441,7 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS);
 
         m_creature->InterruptNonMeleeSpells(false);
@@ -454,44 +454,44 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI
 
     void DamageTaken(Unit*, uint32 &damage)
     {
-        if(damage >= m_creature->GetHealth())
+        if (damage >= m_creature->GetHealth())
             m_creature->CastSpell(m_creature, SPELL_SOUL_TRANSFER, true);
     }
 
     void JustDied(Unit* who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_CHANNELER_EVENT, DONE);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(ShadowBoltVolley_Timer < diff)
+        if (ShadowBoltVolley_Timer < diff)
         {
             DoCast(m_creature, SPELL_SHADOW_BOLT_VOLLEY);
             ShadowBoltVolley_Timer = 10000 + rand()%10000;
         }else ShadowBoltVolley_Timer -= diff;
 
-        if(DarkMending_Timer < diff)
+        if (DarkMending_Timer < diff)
         {
-            if((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50)
+            if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50)
                 DoCast(m_creature, SPELL_DARK_MENDING);
             DarkMending_Timer = 10000 +(rand() % 10000);
         }else DarkMending_Timer -= diff;
 
-        if(Fear_Timer < diff)
+        if (Fear_Timer < diff)
         {
-            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1))
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1))
                 DoCast(target, SPELL_FEAR);
             Fear_Timer = 25000 + rand()%15000;
         }else Fear_Timer -= diff;
 
-        if(Infernal_Timer < diff)
+        if (Infernal_Timer < diff)
         {
-            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 m_creature->CastSpell(target, SPELL_BURNING_ABYSSAL, true);
             Infernal_Timer = 30000 + rand()%10000;
         }else Infernal_Timer -= diff;
@@ -501,22 +501,22 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI
 };
 
 //Manticron Cube
-bool GOHello_go_Manticron_Cube(Player *player, GameObject* _GO)
+bool GOHello_go_Manticron_Cube(Player* pPlayer, GameObject* _GO)
 {
     ScriptedInstance* pInstance =_GO->GetInstanceData();
-    if(!pInstance) return true;
-    if(pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS) return true;
+    if (!pInstance) return true;
+    if (pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS) return true;
     Creature *Magtheridon =Unit::GetCreature(*_GO, pInstance->GetData64(DATA_MAGTHERIDON));
-    if(!Magtheridon || !Magtheridon->isAlive()) return true;
+    if (!Magtheridon || !Magtheridon->isAlive()) return true;
 
     // if exhausted or already channeling return
-    if(player->HasAura(SPELL_MIND_EXHAUSTION) || player->HasAura(SPELL_SHADOW_GRASP))
+    if (pPlayer->HasAura(SPELL_MIND_EXHAUSTION) || pPlayer->HasAura(SPELL_SHADOW_GRASP))
         return true;
 
-    player->InterruptNonMeleeSpells(false);
-    player->CastSpell(player, SPELL_SHADOW_GRASP, true);
-    player->CastSpell(player, SPELL_SHADOW_GRASP_VISUAL, false);
-    CAST_AI(boss_magtheridonAI, Magtheridon->AI())->SetClicker(_GO->GetGUID(), player->GetGUID());
+    pPlayer->InterruptNonMeleeSpells(false);
+    pPlayer->CastSpell(pPlayer, SPELL_SHADOW_GRASP, true);
+    pPlayer->CastSpell(pPlayer, SPELL_SHADOW_GRASP_VISUAL, false);
+    CAST_AI(boss_magtheridonAI, Magtheridon->AI())->SetClicker(_GO->GetGUID(), pPlayer->GetGUID());
     return true;
 }
 
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
index 3a347ed8a72..cd022c81e2d 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
@@ -35,7 +35,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
 {
-    instance_magtheridons_lair(Map *Map) : ScriptedInstance(Map)
+    instance_magtheridons_lair(Map* pMap) : ScriptedInstance(pMap)
     {
         Initialize();
     }
@@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS) return true;
+            if (Encounters[i] == IN_PROGRESS) return true;
         return false;
     }
 
@@ -122,23 +122,23 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
         {
         case DATA_MAGTHERIDON_EVENT:
             Encounters[0] = data;
-            if(data == NOT_STARTED)
+            if (data == NOT_STARTED)
                 RespawnTimer = 10000;
-            if(data != IN_PROGRESS)
+            if (data != IN_PROGRESS)
                HandleGameObject(DoorGUID, true);
             break;
         case DATA_CHANNELER_EVENT:
             switch(data)
             {
             case NOT_STARTED: // Reset all channelers once one is reset.
-                if(Encounters[1] != NOT_STARTED)
+                if (Encounters[1] != NOT_STARTED)
                 {
                     Encounters[1] = NOT_STARTED;
                     for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                     {
-                        if(Creature *Channeler = instance->GetCreature(*i))
+                        if (Creature *Channeler = instance->GetCreature(*i))
                         {
-                            if(Channeler->isAlive())
+                            if (Channeler->isAlive())
                                 Channeler->AI()->EnterEvadeMode();
                             else
                                 Channeler->Respawn();
@@ -148,19 +148,19 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
                     HandleGameObject(DoorGUID, true);
                 }break;
             case IN_PROGRESS: // Event start.
-                if(Encounters[1] != IN_PROGRESS)
+                if (Encounters[1] != IN_PROGRESS)
                 {
                     Encounters[1] = IN_PROGRESS;
                     // Let all five channelers aggro.
                     for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                     {
                         Creature *Channeler = instance->GetCreature(*i);
-                        if(Channeler && Channeler->isAlive())
+                        if (Channeler && Channeler->isAlive())
                             Channeler->AI()->AttackStart(Channeler->SelectNearestTarget(999));
                     }
                     // Release Magtheridon after two minutes.
                     Creature *Magtheridon = instance->GetCreature(MagtheridonGUID);
-                    if(Magtheridon && Magtheridon->isAlive())
+                    if (Magtheridon && Magtheridon->isAlive())
                     {
                         Magtheridon->MonsterTextEmote("'s bonds begin to weaken!", 0);
                         CageTimer = 120000;
@@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
                 for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                 {
                     Creature *Channeler = instance->GetCreature(*i);
-                    if(Channeler && Channeler->isAlive())
+                    if (Channeler && Channeler->isAlive())
                     {
                         //Channeler->CastSpell(Channeler, SPELL_SOUL_TRANSFER, true);
                         data = IN_PROGRESS;
@@ -193,19 +193,19 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
 
     uint32 GetData(uint32 type)
     {
-        if(type == DATA_MAGTHERIDON_EVENT)
+        if (type == DATA_MAGTHERIDON_EVENT)
             return Encounters[0];
         return 0;
     }
 
     void Update(uint32 diff)
     {
-        if(CageTimer)
+        if (CageTimer)
         {
-            if(CageTimer <= diff)
+            if (CageTimer <= diff)
             {
                 Creature *Magtheridon = instance->GetCreature(MagtheridonGUID);
-                if(Magtheridon && Magtheridon->isAlive())
+                if (Magtheridon && Magtheridon->isAlive())
                 {
                     Magtheridon->clearUnitState(UNIT_STAT_STUNNED);
                     Magtheridon->AI()->AttackStart(Magtheridon->SelectNearestTarget(999));
@@ -214,15 +214,15 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
             }else CageTimer -= diff;
         }
 
-        if(RespawnTimer)
+        if (RespawnTimer)
         {
-            if(RespawnTimer <= diff)
+            if (RespawnTimer <= diff)
             {
                 for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                 {
-                    if(Creature *Channeler = instance->GetCreature(*i))
+                    if (Creature *Channeler = instance->GetCreature(*i))
                     {
-                        if(Channeler->isAlive())
+                        if (Channeler->isAlive())
                             Channeler->AI()->EnterEvadeMode();
                         else
                             Channeler->Respawn();
@@ -234,9 +234,9 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_magtheridons_lair(Map* map)
+InstanceData* GetInstanceData_instance_magtheridons_lair(Map* pMap)
 {
-    return new instance_magtheridons_lair(map);
+    return new instance_magtheridons_lair(pMap);
 }
 
 void AddSC_instance_magtheridons_lair()
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
index 67345f15aef..fb6d9a6fa47 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
@@ -251,7 +251,7 @@ struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI
             }
         }
 
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (!IsMainEvent)
@@ -326,7 +326,7 @@ struct TRINITY_DLL_DECL mob_fel_orc_convertAI : public ScriptedAI
                 {
                     CAST_AI(boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonAggro();
 
-                    if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS )
+                    if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS)
                         return;
                     else pInstance->SetData(TYPE_NETHEKURSE,IN_PROGRESS);
                 }
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
index b14f4832b8e..6f0f21b8894 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
@@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI
 
     void KilledUnit(Unit *victim)
     {
-        if(victim->GetTypeId() == TYPEID_PLAYER)
+        if (victim->GetTypeId() == TYPEID_PLAYER)
         {
             switch(rand()%2)
             {
@@ -139,15 +139,15 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI
 
     void MovementInform(uint32 type, uint32 id)
     {
-        if(InBlade)
+        if (InBlade)
         {
-            if(type != POINT_MOTION_TYPE)
+            if (type != POINT_MOTION_TYPE)
                 return;
 
-            if(id != 1)
+            if (id != 1)
                 return;
 
-            if(target_num > 0) // to prevent loops
+            if (target_num > 0) // to prevent loops
             {
                 Wait_Timer = 1;
                 DoCast(m_creature,SPELL_BLADE_DANCE,true);
@@ -161,7 +161,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI
         for(std::vector<uint64>::iterator itr = adds.begin(); itr!= adds.end(); ++itr)
         {
             Unit* temp = Unit::GetUnit((*m_creature),*itr);
-            if(temp && temp->isAlive())
+            if (temp && temp->isAlive())
             {
                 (*temp).GetMotionMaster()->Clear(true);
                 m_creature->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
@@ -173,7 +173,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI
         for(std::vector<uint64>::iterator itr = assassins.begin(); itr!= assassins.end(); ++itr)
         {
             Unit* temp = Unit::GetUnit((*m_creature),*itr);
-            if(temp && temp->isAlive())
+            if (temp && temp->isAlive())
             {
                 (*temp).GetMotionMaster()->Clear(true);
                 m_creature->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
@@ -196,19 +196,19 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(Assassins_Timer)
-            if(Assassins_Timer < diff)
+        if (Assassins_Timer)
+            if (Assassins_Timer < diff)
             {
                 SpawnAssassin();
                 Assassins_Timer = 0;
             }else Assassins_Timer -= diff;
 
-        if(InBlade)
+        if (InBlade)
         {
-            if(Wait_Timer)
-                if(Wait_Timer < diff)
+            if (Wait_Timer)
+                if (Wait_Timer < diff)
                 {
-                    if(target_num <= 0)
+                    if (target_num <= 0)
                     {
                         // stop bladedance
                         InBlade = false;
@@ -216,7 +216,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI
                         (*m_creature).GetMotionMaster()->MoveChase(m_creature->getVictim());
                         Blade_Dance_Timer = 30000;
                         Wait_Timer = 0;
-                        if(HeroicMode)
+                        if (HeroicMode)
                             Charge_timer = 5000;
                     }
                     else
@@ -234,8 +234,8 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI
         }
         else
         {
-            if(Blade_Dance_Timer)
-                if(Blade_Dance_Timer < diff)
+            if (Blade_Dance_Timer)
+                if (Blade_Dance_Timer < diff)
                 {
                     target_num = TARGET_NUM;
                     Wait_Timer = 1;
@@ -245,8 +245,8 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI
                     return;
                 }else Blade_Dance_Timer -= diff;
 
-            if(Charge_timer)
-                if(Charge_timer < diff)
+            if (Charge_timer)
+                if (Charge_timer < diff)
                 {
                     DoCast(SelectUnit(SELECT_TARGET_RANDOM,0),H_SPELL_CHARGE);
                     Charge_timer = 0;
@@ -265,7 +265,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI
                         case 2: m_creature->SummonCreature(MOB_REAVER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); break;
                     }
                 }
-                if(rand()%100 < 20) summoned++;
+                if (rand()%100 < 20) summoned++;
                     Summon_Assistant_Timer = 25000 + (rand()%10000) ;
             }else Summon_Assistant_Timer -= diff;
 
diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
index 4cbec537d65..b9fb2dec062 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
@@ -30,7 +30,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_shattered_halls : public ScriptedInstance
 {
-    instance_shattered_halls(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_shattered_halls(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounter[ENCOUNTERS];
     uint64 nethekurseGUID;
@@ -47,7 +47,7 @@ struct TRINITY_DLL_DECL instance_shattered_halls : public ScriptedInstance
 
     void OnGameObjectCreate(GameObject *go, bool add)
     {
-        switch( go->GetEntry() )
+        switch(go->GetEntry())
         {
             case DOOR_NETHEKURSE: nethekurseDoorGUID = go->GetGUID(); break;
         }
@@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL instance_shattered_halls : public ScriptedInstance
 
     void SetData(uint32 type, uint32 data)
     {
-        switch( type )
+        switch(type)
         {
             case TYPE_NETHEKURSE:
                 Encounter[0] = data;
@@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL instance_shattered_halls : public ScriptedInstance
 
     uint32 GetData(uint32 type)
     {
-        switch( type )
+        switch(type)
         {
             case TYPE_NETHEKURSE:
                 return Encounter[0];
@@ -99,9 +99,9 @@ struct TRINITY_DLL_DECL instance_shattered_halls : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_shattered_halls(Map* map)
+InstanceData* GetInstanceData_instance_shattered_halls(Map* pMap)
 {
-    return new instance_shattered_halls(map);
+    return new instance_shattered_halls(pMap);
 }
 
 void AddSC_instance_shattered_halls()
diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp
index 6d731aab5e5..2ab8643847e 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/boss_doomlord_kazzak.cpp
@@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //ShadowVolley_Timer
@@ -141,7 +141,7 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI
         if (MarkOfKazzak_Timer < diff)
         {
             Unit* victim = SelectUnit(SELECT_TARGET_RANDOM, 0);
-            if(victim->GetPower(POWER_MANA))
+            if (victim->GetPower(POWER_MANA))
             {
                 DoCast(victim, SPELL_MARKOFKAZZAK);
                 MarkOfKazzak_Timer = 20000;
@@ -156,7 +156,7 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI
             Enrage_Timer = 30000;
         }else Enrage_Timer -= diff;
 
-        if(Twisted_Reflection_Timer < diff)
+        if (Twisted_Reflection_Timer < diff)
         {
             DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_TWISTEDREFLECTION);
             Twisted_Reflection_Timer = 15000;
diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp
index b0dc4d53786..7eaa306b030 100644
--- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp
+++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp
@@ -120,7 +120,7 @@ CreatureAI* GetAI_npc_aeranas(Creature *_Creature)
 ## go_haaleshi_altar
 ######*/
 
-bool GOHello_go_haaleshi_altar(Player *player, GameObject* _GO)
+bool GOHello_go_haaleshi_altar(Player* pPlayer, GameObject* _GO)
 {
     _GO->SummonCreature(C_AERANAS,-1321.79, 4043.80, 116.24, 1.25, TEMPSUMMON_TIMED_DESPAWN, 180000);
     return false;
@@ -148,35 +148,35 @@ struct TRINITY_DLL_DECL npc_wounded_blood_elfAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!player || player->GetTypeId() != TYPEID_PLAYER)
+        if (!pPlayer || pPlayer->GetTypeId() != TYPEID_PLAYER)
             return;
 
         switch (i)
         {
         case 0:
-            DoScriptText(SAY_ELF_START, m_creature, player);
+            DoScriptText(SAY_ELF_START, m_creature, pPlayer);
             break;
         case 9:
-            DoScriptText(SAY_ELF_SUMMON1, m_creature, player);
+            DoScriptText(SAY_ELF_SUMMON1, m_creature, pPlayer);
             // Spawn two Haal'eshi Talonguard
             DoSpawnCreature(16967, -15, -15, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
             DoSpawnCreature(16967, -17, -17, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
             break;
         case 13:
-            DoScriptText(SAY_ELF_RESTING, m_creature, player);
+            DoScriptText(SAY_ELF_RESTING, m_creature, pPlayer);
             break;
         case 14:
-            DoScriptText(SAY_ELF_SUMMON2, m_creature, player);
+            DoScriptText(SAY_ELF_SUMMON2, m_creature, pPlayer);
             // Spawn two Haal'eshi Windwalker
             DoSpawnCreature(16966, -15, -15, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
             DoSpawnCreature(16966, -17, -17, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
             break;
         case 27:
-            DoScriptText(SAY_ELF_COMPLETE, m_creature, player);
+            DoScriptText(SAY_ELF_COMPLETE, m_creature, pPlayer);
             // Award quest credit
-            player->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH,m_creature);
+            pPlayer->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH,m_creature);
             break;
         }
     }
@@ -206,9 +206,9 @@ struct TRINITY_DLL_DECL npc_wounded_blood_elfAI : public npc_escortAI
         if (PlayerGUID)
         {
             // If NPC dies, player fails the quest
-            Player* player = Unit::GetPlayer(PlayerGUID);
-            if (player)
-                player->FailQuest(QUEST_ROAD_TO_FALCON_WATCH);
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (pPlayer)
+                pPlayer->FailQuest(QUEST_ROAD_TO_FALCON_WATCH);
         }
     }
 
@@ -227,11 +227,11 @@ CreatureAI* GetAI_npc_wounded_blood_elf(Creature* pCreature)
     return welfAI;
 }
 
-bool QuestAccept_npc_wounded_blood_elf(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_wounded_blood_elf(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH)
     {
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
         // Change faction so mobs attack
         creature->setFaction(775);
     }
diff --git a/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp b/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp
index 7f81711035e..1f1c5953e10 100644
--- a/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp
+++ b/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp
@@ -37,45 +37,45 @@ EndContentData */
 #define GOSSIP_ITEM_ROYAL_3 "Unbelievable! How dare they??"
 #define GOSSIP_ITEM_ROYAL_4 "Of course I will help!"
 
-bool GossipHello_npc_royal_historian_archesonus(Player *player, Creature *_Creature)
+bool GossipHello_npc_royal_historian_archesonus(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(3702) == QUEST_STATUS_INCOMPLETE)
+    if (pPlayer->GetQuestStatus(3702) == QUEST_STATUS_INCOMPLETE)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
-        player->SEND_GOSSIP_MENU(2235, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        pPlayer->SEND_GOSSIP_MENU(2235, _Creature->GetGUID());
     }
     else
-        player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_royal_historian_archesonus(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_royal_historian_archesonus(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->SEND_GOSSIP_MENU(2236, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(2236, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(2237, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(2237, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(2238, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(2238, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->SEND_GOSSIP_MENU(2239, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(2239, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(3702);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(3702);
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp
index 3dd7c83a30f..68c937490a0 100644
--- a/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp
+++ b/src/bindings/scripts/scripts/zone/isle_of_queldanas/isle_of_queldanas.cpp
@@ -57,18 +57,18 @@ struct TRINITY_DLL_DECL npc_converted_sentryAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if( !Credit )
+        if (!Credit)
         {
-            if( Timer <= diff )
+            if (Timer <= diff)
             {
                 uint32 i = urand(1,2);
-                if( i==1 )
+                if (i==1)
                     DoScriptText(SAY_CONVERTED_1, m_creature);
                 else
                     DoScriptText(SAY_CONVERTED_2, m_creature);
 
                 DoCast(m_creature, SPELL_CONVERT_CREDIT);
-                if(m_creature->isPet())
+                if (m_creature->isPet())
                     CAST_PET(m_creature)->SetDuration(7500);
                 Credit = true;
             }else Timer -= diff;
@@ -104,21 +104,21 @@ struct TRINITY_DLL_DECL npc_greengill_slaveAI : public ScriptedAI
 
     void SpellHit(Unit* caster, const SpellEntry* spell)
     {
-        if(!caster)
+        if (!caster)
             return;
 
-        if(caster->GetTypeId() == TYPEID_PLAYER && spell->Id == ORB && !m_creature->HasAura(ENRAGE))
+        if (caster->GetTypeId() == TYPEID_PLAYER && spell->Id == ORB && !m_creature->HasAura(ENRAGE))
         {
             PlayerGUID = caster->GetGUID();
-            if(PlayerGUID)
+            if (PlayerGUID)
             {
                 Unit* plr = Unit::GetUnit((*m_creature), PlayerGUID);
-                if(plr && CAST_PLR(plr)->GetQuestStatus(QUESTG) == QUEST_STATUS_INCOMPLETE)
+                if (plr && CAST_PLR(plr)->GetQuestStatus(QUESTG) == QUEST_STATUS_INCOMPLETE)
                     DoCast(plr, 45110, true);
             }
             DoCast(m_creature, ENRAGE);
             Unit* Myrmidon = me->FindNearestCreature(DM, 70);
-            if(Myrmidon)
+            if (Myrmidon)
             {
                 m_creature->AddThreat(Myrmidon, 100000.0f);
                 AttackStart(Myrmidon);
diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp
index 9fb9d2226bd..539dfefaacc 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp
@@ -84,7 +84,7 @@ struct  TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //always decrease BerserkTimer
diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp
index 69fae7d4f72..50bc037d6fb 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_maiden_of_virtue.cpp
@@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI
 
     void KilledUnit(Unit* Victim)
     {
-        if(rand()%2)
+        if (rand()%2)
             return;
 
         switch(rand()%3)
@@ -85,7 +85,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (Enrage_Timer < diff && !Enraged)
diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp
index b02e373d953..2bbe70e3373 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp
@@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_midnightAI : public ScriptedAI
 
     void KilledUnit(Unit *victim)
     {
-        if(Phase == 2)
+        if (Phase == 2)
         {
             if (Unit *pUnit = Unit::GetUnit(*m_creature, Attumen))
             DoScriptText(SAY_MIDNIGHT_KILL, pUnit);
@@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL boss_midnightAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(Phase == 1 && (m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 95)
+        if (Phase == 1 && (m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 95)
         {
             Phase = 2;
             if (Creature* pAttumen = m_creature->SummonCreature(SUMMON_ATTUMEN, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 30000))
@@ -94,16 +94,16 @@ struct TRINITY_DLL_DECL boss_midnightAI : public ScriptedAI
                 }
             }
         }
-        else if(Phase == 2 && (m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 25)
+        else if (Phase == 2 && (m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 25)
         {
             if (Unit *pAttumen = Unit::GetUnit(*m_creature, Attumen))
                 Mount(pAttumen);
         }
-        else if(Phase ==3)
+        else if (Phase ==3)
         {
-            if(Mount_Timer)
+            if (Mount_Timer)
             {
-                if(Mount_Timer <= diff)
+                if (Mount_Timer <= diff)
                 {
                     Mount_Timer = 0;
                     m_creature->SetVisibility(VISIBILITY_OFF);
@@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL boss_midnightAI : public ScriptedAI
                     {
                         pAttumen->SetDisplayId(MOUNTED_DISPLAYID);
                         pAttumen->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-                        if(pAttumen->getVictim())
+                        if (pAttumen->getVictim())
                         {
                             pAttumen->GetMotionMaster()->MoveChase(pAttumen->getVictim());
                             pAttumen->SetUInt64Value(UNIT_FIELD_TARGET, pAttumen->getVictim()->GetGUID());
@@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL boss_midnightAI : public ScriptedAI
             }
         }
 
-        if(Phase != 3)
+        if (Phase != 3)
             DoMeleeAttackIfReady();
     }
 
@@ -206,13 +206,13 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(ResetTimer)
+        if (ResetTimer)
         {
-            if(ResetTimer <= diff)
+            if (ResetTimer <= diff)
             {
                 ResetTimer = 0;
                 Unit *pMidnight = Unit::GetUnit(*m_creature, Midnight);
-                if(pMidnight)
+                if (pMidnight)
                 {
                     pMidnight->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                     pMidnight->SetVisibility(VISIBILITY_ON);
@@ -227,22 +227,22 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE ))
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE))
             return;
 
-        if(CleaveTimer < diff)
+        if (CleaveTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SHADOWCLEAVE);
             CleaveTimer = 10000 + (rand()%6)*1000;
         } else CleaveTimer -= diff;
 
-        if(CurseTimer < diff)
+        if (CurseTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_INTANGIBLE_PRESENCE);
             CurseTimer = 30000;
         } else CurseTimer -= diff;
 
-        if(RandomYellTimer < diff)
+        if (RandomYellTimer < diff)
         {
             switch(rand()%2)
             {
@@ -252,9 +252,9 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI
             RandomYellTimer = 30000 + (rand()%31)*1000;
         } else RandomYellTimer -= diff;
 
-        if(m_creature->GetUInt32Value(UNIT_FIELD_DISPLAYID) == MOUNTED_DISPLAYID)
+        if (m_creature->GetUInt32Value(UNIT_FIELD_DISPLAYID) == MOUNTED_DISPLAYID)
         {
-            if(ChargeTimer < diff)
+            if (ChargeTimer < diff)
             {
                 Unit *target;
                 std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
@@ -266,7 +266,7 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI
                         target_list.push_back(target);
                     target = NULL;
                 }
-                if(target_list.size())
+                if (target_list.size())
                     target = *(target_list.begin()+rand()%target_list.size());
 
                 DoCast(target, SPELL_BERSERKER_CHARGE);
@@ -275,10 +275,10 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI
         }
         else
         {
-            if( (m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 25)
+            if ((m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 25)
             {
                 Creature *pMidnight = Unit::GetCreature(*m_creature, Midnight);
-                if(pMidnight && pMidnight->GetTypeId() == TYPEID_UNIT)
+                if (pMidnight && pMidnight->GetTypeId() == TYPEID_UNIT)
                 {
                     CAST_AI(boss_midnightAI, (pMidnight->AI()))->Mount(m_creature);
                     m_creature->SetHealth(pMidnight->GetHealth());
@@ -292,7 +292,7 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI
 
     void SpellHit(Unit *source, const SpellEntry *spell)
     {
-        if(spell->Mechanic == MECHANIC_DISARM)
+        if (spell->Mechanic == MECHANIC_DISARM)
             DoScriptText(SAY_DISARMED, m_creature);
     }
 };
diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp
index a58351bcf3b..27e5ed62d6f 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp
@@ -93,18 +93,18 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
 
         Enrage = false;
         InVanish = false;
-        if(m_creature->GetHealth() > 0)
+        if (m_creature->GetHealth() > 0)
         {
             SpawnAdds();
         }
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(TYPE_MOROES, NOT_STARTED);
     }
 
     void StartEvent()
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(TYPE_MOROES, IN_PROGRESS);
 
         DoZoneInCombat();
@@ -139,10 +139,10 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
         DeSpawnAdds();
 
         //remove aura from spell Garrote when Moroes dies
-        Map *map = m_creature->GetMap();
-        if (map->IsDungeon())
+        Map* pMap = m_creature->GetMap();
+        if (pMap->IsDungeon())
         {
-            Map::PlayerList const &PlayerList = map->GetPlayers();
+            Map::PlayerList const &PlayerList = pMap->GetPlayers();
 
             if (PlayerList.isEmpty())
                 return;
@@ -158,7 +158,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
     void SpawnAdds()
     {
         DeSpawnAdds();
-        if(isAddlistEmpty())
+        if (isAddlistEmpty())
         {
             Creature *pCreature = NULL;
             std::vector<uint32> AddList;
@@ -200,7 +200,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
     {
         for(uint8 i = 0; i < 4; ++i)
         {
-            if(AddId[i] == 0)
+            if (AddId[i] == 0)
                 return true;
         }
         return false;
@@ -245,16 +245,16 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(pInstance && !pInstance->GetData(TYPE_MOROES))
+        if (pInstance && !pInstance->GetData(TYPE_MOROES))
         {
             EnterEvadeMode();
             return;
         }
 
-        if(!Enrage && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 30)
+        if (!Enrage && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 30)
         {
             DoCast(m_creature, SPELL_FRENZY);
             Enrage = true;
@@ -269,7 +269,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
                 {
                     Temp = Unit::GetCreature((*m_creature),AddGUID[i]);
                     if (Temp && Temp->isAlive())
-                        if (!Temp->getVictim() )
+                        if (!Temp->getVictim())
                             Temp->AI()->AttackStart(m_creature->getVictim());
                 }
             }
@@ -345,23 +345,23 @@ struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(TYPE_MOROES, NOT_STARTED);
     }
 
     void AcquireGUID()
     {
-        if(!pInstance)
+        if (!pInstance)
             return;
 
         GuestGUID[0] = pInstance->GetData64(DATA_MOROES);
         Creature* Moroes = (Unit::GetCreature((*m_creature), GuestGUID[0]));
-        if(Moroes)
+        if (Moroes)
         {
             for(uint8 i = 0; i < 3; ++i)
             {
                 uint64 GUID = CAST_AI(boss_moroesAI, Moroes->AI())->AddGUID[i];
-                if(GUID && GUID != m_creature->GetGUID())
+                if (GUID && GUID != m_creature->GetGUID())
                     GuestGUID[i+1] = GUID;
             }
         }
@@ -370,10 +370,10 @@ struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI
     Unit* SelectTarget()
     {
         uint64 TempGUID = GuestGUID[rand()%5];
-        if(TempGUID)
+        if (TempGUID)
         {
             Unit* pUnit = Unit::GetUnit((*m_creature), TempGUID);
-            if(pUnit && pUnit->isAlive())
+            if (pUnit && pUnit->isAlive())
                 return pUnit;
         }
 
@@ -382,7 +382,7 @@ struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(pInstance && !pInstance->GetData(TYPE_MOROES))
+        if (pInstance && !pInstance->GetData(TYPE_MOROES))
             EnterEvadeMode();
 
         DoMeleeAttackIfReady();
@@ -416,29 +416,29 @@ struct TRINITY_DLL_DECL boss_baroness_dorothea_millstipeAI : public boss_moroes_
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         boss_moroes_guestAI::UpdateAI(diff);
 
-        if(MindFlay_Timer < diff)
+        if (MindFlay_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_MINDFLY);
             MindFlay_Timer = 12000;                         //3sec channeled
         }else MindFlay_Timer -= diff;
 
-        if(ManaBurn_Timer < diff)
+        if (ManaBurn_Timer < diff)
         {
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-            if(target && (target->getPowerType() == POWER_MANA))
+            if (target && (target->getPowerType() == POWER_MANA))
                 DoCast(target,SPELL_MANABURN);
             ManaBurn_Timer = 5000;                          //3 sec cast
         }else ManaBurn_Timer -= diff;
 
-        if(ShadowWordPain_Timer < diff)
+        if (ShadowWordPain_Timer < diff)
         {
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-            if(target)
+            if (target)
             {
                 DoCast(target,SPELL_SWPAIN);
                 ShadowWordPain_Timer = 7000;
@@ -471,25 +471,25 @@ struct TRINITY_DLL_DECL boss_baron_rafe_dreugerAI : public boss_moroes_guestAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         boss_moroes_guestAI::UpdateAI(diff);
 
-        if(SealOfCommand_Timer < diff)
+        if (SealOfCommand_Timer < diff)
         {
             DoCast(m_creature,SPELL_SEALOFCOMMAND);
             SealOfCommand_Timer = 32000;
             JudgementOfCommand_Timer = 29000;
         }else SealOfCommand_Timer -= diff;
 
-        if(JudgementOfCommand_Timer < diff)
+        if (JudgementOfCommand_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_JUDGEMENTOFCOMMAND);
             JudgementOfCommand_Timer = SealOfCommand_Timer + 29000;
         }else JudgementOfCommand_Timer -= diff;
 
-        if(HammerOfJustice_Timer < diff)
+        if (HammerOfJustice_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_HAMMEROFJUSTICE);
             HammerOfJustice_Timer = 12000;
@@ -526,18 +526,18 @@ struct TRINITY_DLL_DECL boss_lady_catriona_von_indiAI : public boss_moroes_guest
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         boss_moroes_guestAI::UpdateAI(diff);
 
-        if(PowerWordShield_Timer < diff)
+        if (PowerWordShield_Timer < diff)
         {
             DoCast(m_creature,SPELL_PWSHIELD);
             PowerWordShield_Timer = 15000;
         }else PowerWordShield_Timer -= diff;
 
-        if(GreaterHeal_Timer < diff)
+        if (GreaterHeal_Timer < diff)
         {
             Unit* target = SelectTarget();
 
@@ -545,15 +545,15 @@ struct TRINITY_DLL_DECL boss_lady_catriona_von_indiAI : public boss_moroes_guest
             GreaterHeal_Timer = 17000;
         }else GreaterHeal_Timer -= diff;
 
-        if(HolyFire_Timer < diff)
+        if (HolyFire_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_HOLYFIRE);
             HolyFire_Timer = 22000;
         }else HolyFire_Timer -= diff;
 
-        if(DispelMagic_Timer < diff)
+        if (DispelMagic_Timer < diff)
         {
-            if(rand()%2)
+            if (rand()%2)
             {
                 Unit* target = SelectTarget();
 
@@ -596,18 +596,18 @@ struct TRINITY_DLL_DECL boss_lady_keira_berrybuckAI : public boss_moroes_guestAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         boss_moroes_guestAI::UpdateAI(diff);
 
-        if(DivineShield_Timer < diff)
+        if (DivineShield_Timer < diff)
         {
             DoCast(m_creature,SPELL_DIVINESHIELD);
             DivineShield_Timer = 31000;
         }else DivineShield_Timer -= diff;
 
-        if(HolyLight_Timer < diff)
+        if (HolyLight_Timer < diff)
         {
             Unit* target = SelectTarget();
 
@@ -615,7 +615,7 @@ struct TRINITY_DLL_DECL boss_lady_keira_berrybuckAI : public boss_moroes_guestAI
             HolyLight_Timer = 10000;
         }else HolyLight_Timer -= diff;
 
-        if(GreaterBless_Timer < diff)
+        if (GreaterBless_Timer < diff)
         {
             Unit* target = SelectTarget();
 
@@ -624,7 +624,7 @@ struct TRINITY_DLL_DECL boss_lady_keira_berrybuckAI : public boss_moroes_guestAI
             GreaterBless_Timer = 50000;
         }else GreaterBless_Timer -= diff;
 
-        if(Cleanse_Timer < diff)
+        if (Cleanse_Timer < diff)
         {
             Unit* target = SelectTarget();
 
@@ -659,24 +659,24 @@ struct TRINITY_DLL_DECL boss_lord_robin_darisAI : public boss_moroes_guestAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         boss_moroes_guestAI::UpdateAI(diff);
 
-        if(Hamstring_Timer < diff)
+        if (Hamstring_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_HAMSTRING);
             Hamstring_Timer = 12000;
         }else Hamstring_Timer -= diff;
 
-        if(MortalStrike_Timer < diff)
+        if (MortalStrike_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_MORTALSTRIKE);
             MortalStrike_Timer = 18000;
         }else MortalStrike_Timer -= diff;
 
-        if(WhirlWind_Timer < diff)
+        if (WhirlWind_Timer < diff)
         {
             DoCast(m_creature,SPELL_WHIRLWIND);
             WhirlWind_Timer = 21000;
@@ -711,30 +711,30 @@ struct TRINITY_DLL_DECL boss_lord_crispin_ferenceAI : public boss_moroes_guestAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         boss_moroes_guestAI::UpdateAI(diff);
 
-        if(Disarm_Timer < diff)
+        if (Disarm_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_DISARM);
             Disarm_Timer = 12000;
         }else Disarm_Timer -= diff;
 
-        if(HeroicStrike_Timer < diff)
+        if (HeroicStrike_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_HEROICSTRIKE);
             HeroicStrike_Timer = 10000;
         }else HeroicStrike_Timer -= diff;
 
-        if(ShieldBash_Timer < diff)
+        if (ShieldBash_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_SHIELDBASH);
             ShieldBash_Timer = 13000;
         }else ShieldBash_Timer -= diff;
 
-        if(ShieldWall_Timer < diff)
+        if (ShieldWall_Timer < diff)
         {
             DoCast(m_creature,SPELL_SHIELDWALL);
             ShieldWall_Timer = 21000;
diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp
index bc6b9e14161..65ab2cfbec1 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_nightbane.cpp
@@ -113,14 +113,14 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
         m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
         m_creature->setActive(true);
 
-        if(pInstance->GetData(TYPE_NIGHTBANE) == DONE || pInstance->GetData(TYPE_NIGHTBANE) == IN_PROGRESS)
+        if (pInstance->GetData(TYPE_NIGHTBANE) == DONE || pInstance->GetData(TYPE_NIGHTBANE) == IN_PROGRESS)
         {
             m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
             m_creature->RemoveCorpse();
         }
         else
         {
-            if(pInstance)
+            if (pInstance)
                 pInstance->SetData(TYPE_NIGHTBANE, NOT_STARTED);
         }
 
@@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
         Flying = false;
         Movement = false;
 
-        if(!Intro)
+        if (!Intro)
         {
             m_creature->SetHomePosition(IntroWay[7][0],IntroWay[7][1],IntroWay[7][2],0);
             m_creature->GetMotionMaster()->MoveTargetedHome();
@@ -144,7 +144,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(TYPE_NIGHTBANE, IN_PROGRESS);
 
         HandleTerraceDoors(false);
@@ -153,13 +153,13 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
 
     void AttackStart(Unit* who)
     {
-        if(!Intro && !Flying)
+        if (!Intro && !Flying)
             ScriptedAI::AttackStart(who);
     }
 
     void JustDied(Unit* killer)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(TYPE_NIGHTBANE, DONE);
 
         HandleTerraceDoors(true);
@@ -167,18 +167,18 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(!Intro && !Flying)
+        if (!Intro && !Flying)
             ScriptedAI::MoveInLineOfSight(who);
     }
 
     void MovementInform(uint32 type, uint32 id)
     {
-        if(type != POINT_MOTION_TYPE)
+        if (type != POINT_MOTION_TYPE)
                 return;
 
-        if(Intro)
+        if (Intro)
         {
-            if(id >= 8)
+            if (id >= 8)
             {
                 Intro = false;
                 m_creature->SetHomePosition(IntroWay[7][0],IntroWay[7][1],IntroWay[7][2],0);
@@ -188,9 +188,9 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
             WaitTimer = 1;
         }
 
-        if(Flying)
+        if (Flying)
         {
-            if(id == 0)
+            if (id == 0)
             {
                 DoTextEmote(EMOTE_BREATH, NULL, true);
                 Flying = false;
@@ -198,14 +198,14 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
                 return;
             }
 
-            if(id == 3)
+            if (id == 3)
             {
                 MovePhase = 4;
                 WaitTimer = 1;
                 return;
             }
 
-            if(id == 8)
+            if (id == 8)
             {
                 Flying = false;
                 Phase = 1;
@@ -244,12 +244,12 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(WaitTimer)
-        if(WaitTimer < diff)
+        if (WaitTimer)
+        if (WaitTimer < diff)
         {
-            if(Intro)
+            if (Intro)
             {
-                if(MovePhase >= 7)
+                if (MovePhase >= 7)
                 {
                     m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
                     m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
@@ -262,9 +262,9 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
                 }
             }
 
-            if(Flying)
+            if (Flying)
             {
-                if(MovePhase >= 7)
+                if (MovePhase >= 7)
                 {
                     m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
                     m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
@@ -280,16 +280,16 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
             WaitTimer = 0;
         }else WaitTimer -= diff;
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(Flying)
+        if (Flying)
             return;
 
         //  Phase 1 "GROUND FIGHT"
-        if(Phase == 1)
+        if (Phase == 1)
         {
-            if(Movement)
+            if (Movement)
             {
                 DoStartMovement(m_creature->getVictim());
                 Movement = false;
@@ -317,7 +317,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
             if (TailSweepTimer < diff)
             {
                 if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
-                    if (!m_creature->HasInArc( M_PI, target))
+                    if (!m_creature->HasInArc(M_PI, target))
                         DoCast(target,SPELL_TAIL_SWEEP);
                 TailSweepTimer = 15000;//timer
             }else TailSweepTimer -= diff;
@@ -391,7 +391,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
 
             if (FlyTimer < diff) //landing
             {
-                if(rand()%2 == 0)
+                if (rand()%2 == 0)
                     DoYell(YELL_LAND_PHASE_1, LANG_UNIVERSAL, NULL);
                 else
                     DoYell(YELL_LAND_PHASE_2, LANG_UNIVERSAL, NULL);
diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp
index 8bba3cc1ea5..2baf4b1fb20 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_prince_malchezaar.cpp
@@ -110,16 +110,16 @@ struct TRINITY_DLL_DECL netherspite_infernalAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(HellfireTimer)
-            if(HellfireTimer <= diff)
+        if (HellfireTimer)
+            if (HellfireTimer <= diff)
         {
             DoCast(m_creature, SPELL_HELLFIRE);
             HellfireTimer = 0;
         }
         else HellfireTimer -= diff;
 
-        if(CleanupTimer)
-            if(CleanupTimer <= diff)
+        if (CleanupTimer)
+            if (CleanupTimer <= diff)
         {
             Cleanup();
             CleanupTimer = 0;
@@ -129,13 +129,13 @@ struct TRINITY_DLL_DECL netherspite_infernalAI : public ScriptedAI
     void KilledUnit(Unit *who)
     {
         Unit *pMalchezaar = Unit::GetUnit(*m_creature, malchezaar);
-        if(pMalchezaar)
+        if (pMalchezaar)
             CAST_CRE(pMalchezaar)->AI()->KilledUnit(who);
     }
 
     void SpellHit(Unit *who, const SpellEntry *spell)
     {
-        if(spell->Id == SPELL_INFERNAL_RELAY)
+        if (spell->Id == SPELL_INFERNAL_RELAY)
         {
             m_creature->SetDisplayId(m_creature->GetUInt32Value(UNIT_FIELD_NATIVEDISPLAYID));
             m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -146,7 +146,7 @@ struct TRINITY_DLL_DECL netherspite_infernalAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(done_by->GetGUID() != malchezaar)
+        if (done_by->GetGUID() != malchezaar)
             damage = 0;
     }
 
@@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
         SunderArmorTimer = 5000 + rand()%5000;
         phase = 1;
 
-        if(pInstance)
+        if (pInstance)
             pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), true);
     }
 
@@ -232,7 +232,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
         for(uint8 i = 0; i < TOTAL_INFERNAL_POINTS; ++i)
             positions.push_back(&InfernalPoints[i]);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), true);
     }
 
@@ -240,7 +240,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
     {
         DoScriptText(SAY_AGGRO, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_NETHER_DOOR), false); // Open the door leading further in
     }
 
@@ -250,7 +250,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
         for(std::vector<uint64>::iterator itr = infernals.begin(); itr!= infernals.end(); ++itr)
         {
             Unit *pInfernal = Unit::GetUnit(*m_creature, *itr);
-            if(pInfernal && pInfernal->isAlive())
+            if (pInfernal && pInfernal->isAlive())
             {
                 pInfernal->SetVisibility(VISIBILITY_OFF);
                 pInfernal->setDeathState(JUST_DIED);
@@ -264,7 +264,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
         for(uint8 i=0; i<2; ++i)
         {
             Unit *axe = Unit::GetUnit(*m_creature, axes[i]);
-            if(axe && axe->isAlive())
+            if (axe && axe->isAlive())
                 axe->DealDamage(axe, axe->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
             axes[i] = 0;
         }
@@ -284,24 +284,24 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
     void EnfeebleHealthEffect()
     {
         const SpellEntry *info = GetSpellStore()->LookupEntry(SPELL_ENFEEBLE_EFFECT);
-        if(!info)
+        if (!info)
             return;
 
         std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
         std::vector<Unit *> targets;
 
-        if(!t_list.size())
+        if (!t_list.size())
             return;
 
         //begin + 1 , so we don't target the one with the highest threat
         std::list<HostilReference *>::iterator itr = t_list.begin();
         std::advance(itr, 1);
-        for( ; itr!= t_list.end(); ++itr)                   //store the threat list in a different container
+        for(; itr!= t_list.end(); ++itr)                   //store the threat list in a different container
         {
             Unit *target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
                                                             //only on alive players
-            if(target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER )
-                targets.push_back( target);
+            if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER)
+                targets.push_back(target);
         }
 
         //cut down to size if we have more than 5 targets
@@ -312,7 +312,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
         for(std::vector<Unit *>::iterator iter = targets.begin(); iter!= targets.end(); ++iter, ++i)
         {
             Unit *target = *iter;
-            if(target)
+            if (target)
             {
                 enfeeble_targets[i] = target->GetGUID();
                 enfeeble_health[i] = target->GetHealth();
@@ -329,7 +329,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
         for(uint8 i = 0; i < 5; ++i)
         {
             Unit *target = Unit::GetUnit(*m_creature, enfeeble_targets[i]);
-            if(target && target->isAlive())
+            if (target && target->isAlive())
                 target->SetHealth(enfeeble_health[i]);
             enfeeble_targets[i] = 0;
             enfeeble_health[i] = 0;
@@ -340,7 +340,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
     {
         InfernalPoint *point = NULL;
         float posX,posY,posZ;
-        if( (m_creature->GetMapId() != 532) || positions.empty())
+        if ((m_creature->GetMapId() != 532) || positions.empty())
         {
             m_creature->GetRandomPoint(m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 60, posX, posY, posZ);
         }
@@ -361,7 +361,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
         {
             Infernal->SetDisplayId(INFERNAL_MODEL_INVISIBLE);
             Infernal->setFaction(m_creature->getFaction());
-            if(point)
+            if (point)
                 CAST_AI(netherspite_infernalAI, Infernal->AI())->point=point;
             CAST_AI(netherspite_infernalAI, Infernal->AI())->malchezaar=m_creature->GetGUID();
 
@@ -378,25 +378,25 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(EnfeebleResetTimer)
-            if(EnfeebleResetTimer <= diff)                  //Let's not forget to reset that
+        if (EnfeebleResetTimer)
+            if (EnfeebleResetTimer <= diff)                  //Let's not forget to reset that
         {
             EnfeebleResetHealth();
             EnfeebleResetTimer=0;
         }else EnfeebleResetTimer -= diff;
 
-        if(m_creature->hasUnitState(UNIT_STAT_STUNNED))     //While shifting to phase 2 malchezaar stuns himself
+        if (m_creature->hasUnitState(UNIT_STAT_STUNNED))     //While shifting to phase 2 malchezaar stuns himself
             return;
 
-        if(m_creature->GetUInt64Value(UNIT_FIELD_TARGET)!=m_creature->getVictim()->GetGUID())
+        if (m_creature->GetUInt64Value(UNIT_FIELD_TARGET)!=m_creature->getVictim()->GetGUID())
             m_creature->SetUInt64Value(UNIT_FIELD_TARGET, m_creature->getVictim()->GetGUID());
 
-        if(phase == 1)
+        if (phase == 1)
         {
-            if( (m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 60)
+            if ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 60)
             {
                 m_creature->InterruptNonMeleeSpells(false);
 
@@ -429,9 +429,9 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
                 m_creature->SetAttackTime(OFF_ATTACK, (m_creature->GetAttackTime(BASE_ATTACK)*150)/100);
             }
         }
-        else if(phase == 2)
+        else if (phase == 2)
         {
-            if( (m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 30)
+            if ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 30)
             {
                 InfernalTimer = 15000;
 
@@ -448,12 +448,12 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
                 for(uint32 i=0; i<2; ++i)
                 {
                     Creature *axe = m_creature->SummonCreature(MALCHEZARS_AXE, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
-                    if(axe)
+                    if (axe)
                     {
                         axe->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                         axe->setFaction(m_creature->getFaction());
                         axes[i] = axe->GetGUID();
-                        if(target)
+                        if (target)
                         {
                             axe->AI()->AttackStart(target);
                             // axe->getThreatManager().tauntApply(target); //Taunt Apply and fade out does not work properly
@@ -463,13 +463,13 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
                     }
                 }
 
-                if(ShadowNovaTimer > 35000)
+                if (ShadowNovaTimer > 35000)
                     ShadowNovaTimer = EnfeebleTimer + 5000;
 
                 return;
             }
 
-            if(SunderArmorTimer < diff)
+            if (SunderArmorTimer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_SUNDER_ARMOR);
                 SunderArmorTimer = 10000 + rand()%8000;
@@ -485,25 +485,25 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
         }
         else
         {
-            if(AxesTargetSwitchTimer < diff)
+            if (AxesTargetSwitchTimer < diff)
             {
                 AxesTargetSwitchTimer = 7500 + rand()%12500 ;
 
                 Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                if(target)
+                if (target)
                 {
                     for(uint8 i = 0; i < 2; ++i)
                     {
                         Unit *axe = Unit::GetUnit(*m_creature, axes[i]);
-                        if(axe)
+                        if (axe)
                         {
                             float threat = 1000000.0f;
-                            if(axe->getVictim() && DoGetThreat(axe->getVictim()))
+                            if (axe->getVictim() && DoGetThreat(axe->getVictim()))
                             {
                                 threat = axe->getThreatManager().getThreat(axe->getVictim());
                                 axe->getThreatManager().modifyThreatPercent(axe->getVictim(), -100);
                             }
-                            if(target)
+                            if (target)
                                 axe->AddThreat(target, threat);
                             //axe->getThreatManager().tauntFadeOut(axe->getVictim());
                             //axe->getThreatManager().tauntApply(target);
@@ -512,7 +512,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
                 }
             } else AxesTargetSwitchTimer -= diff;
 
-            if(AmplifyDamageTimer < diff)
+            if (AmplifyDamageTimer < diff)
             {
                 DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_AMPLIFY_DAMAGE);
                 AmplifyDamageTimer = 20000 + rand()%10000;
@@ -520,24 +520,24 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
         }
 
         //Time for global and double timers
-        if(InfernalTimer < diff)
+        if (InfernalTimer < diff)
         {
             SummonInfernal(diff);
             InfernalTimer =  phase == 3 ? 14500 : 44500;    //15 secs in phase 3, 45 otherwise
         }else InfernalTimer -= diff;
 
-        if(ShadowNovaTimer < diff)
+        if (ShadowNovaTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SHADOWNOVA);
             ShadowNovaTimer = phase == 3 ? 31000 : -1;
         }else ShadowNovaTimer -= diff;
 
-        if(phase != 2)
+        if (phase != 2)
         {
-            if(SWPainTimer < diff)
+            if (SWPainTimer < diff)
             {
                 Unit* target = NULL;
-                if(phase == 1)
+                if (phase == 1)
                     target = m_creature->getVictim();       // the tank
                 else                                        //anyone but the tank
                     target = SelectUnit(SELECT_TARGET_RANDOM, 1);
@@ -549,9 +549,9 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
             }else SWPainTimer -= diff;
         }
 
-        if(phase != 3)
+        if (phase != 3)
         {
-            if(EnfeebleTimer < diff)
+            if (EnfeebleTimer < diff)
             {
                 EnfeebleHealthEffect();
                 EnfeebleTimer = 30000;
@@ -560,7 +560,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
             }else EnfeebleTimer -= diff;
         }
 
-        if(phase==2)
+        if (phase==2)
             DoMeleeAttacksIfReady();
         else
             DoMeleeAttackIfReady();
@@ -568,16 +568,16 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
 
     void DoMeleeAttacksIfReady()
     {
-        if( m_creature->IsWithinMeleeRange(m_creature->getVictim()) && !m_creature->IsNonMeleeSpellCasted(false))
+        if (m_creature->IsWithinMeleeRange(m_creature->getVictim()) && !m_creature->IsNonMeleeSpellCasted(false))
         {
             //Check for base attack
-            if( m_creature->isAttackReady() && m_creature->getVictim() )
+            if (m_creature->isAttackReady() && m_creature->getVictim())
             {
                 m_creature->AttackerStateUpdate(m_creature->getVictim());
                 m_creature->resetAttackTimer();
             }
             //Check for offhand attack
-            if( m_creature->isAttackReady(OFF_ATTACK) && m_creature->getVictim() )
+            if (m_creature->isAttackReady(OFF_ATTACK) && m_creature->getVictim())
             {
                 m_creature->AttackerStateUpdate(m_creature->getVictim(), OFF_ATTACK);
                 m_creature->resetAttackTimer(OFF_ATTACK);
@@ -588,7 +588,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
     void Cleanup(Creature *infernal, InfernalPoint *point)
     {
         for(std::vector<uint64>::iterator itr = infernals.begin(); itr!= infernals.end(); ++itr)
-            if(*itr == infernal->GetGUID())
+            if (*itr == infernal->GetGUID())
         {
             infernals.erase(itr);
             break;
@@ -602,7 +602,7 @@ void netherspite_infernalAI::Cleanup()
 {
     Unit *pMalchezaar = Unit::GetUnit(*m_creature, malchezaar);
 
-    if(pMalchezaar && pMalchezaar->isAlive())
+    if (pMalchezaar && pMalchezaar->isAlive())
         CAST_AI(boss_malchezaarAI, CAST_CRE(pMalchezaar)->AI())->Cleanup(m_creature, point);
 }
 
diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp
index 934294fc197..9abf3464456 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp
@@ -137,7 +137,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
         Drinking = false;
         DrinkInturrupted = false;
 
-        if(pInstance)
+        if (pInstance)
         {
             // Not in progress
             pInstance->SetData(TYPE_ARAN, NOT_STARTED);
@@ -158,7 +158,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
     {
         DoScriptText(SAY_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(TYPE_ARAN, DONE);
             pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_LIBRARY_DOOR), true);
@@ -174,7 +174,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
         case 2: DoScriptText(SAY_AGGRO3, m_creature); break;
         }
 
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(TYPE_ARAN, IN_PROGRESS);
             pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_LIBRARY_DOOR), false);
@@ -186,7 +186,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
         std::vector<Unit*> targets;
         std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
 
-        if(!t_list.size())
+        if (!t_list.size())
             return;
 
         //store the threat list in a different container
@@ -194,8 +194,8 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
         {
             Unit *target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
             //only on alive players
-            if(target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER )
-                targets.push_back( target);
+            if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER)
+                targets.push_back(target);
         }
 
         //cut down to size if we have more than 3 targets
@@ -205,7 +205,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
         uint32 i = 0;
         for(std::vector<Unit*>::iterator itr = targets.begin(); itr!= targets.end(); ++itr)
         {
-            if(*itr)
+            if (*itr)
             {
                 FlameWreathTarget[i] = (*itr)->GetGUID();
                 FWTargPosX[i] = (*itr)->GetPositionX();
@@ -218,14 +218,14 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(CloseDoorTimer)
+        if (CloseDoorTimer)
         {
-            if(CloseDoorTimer <= diff)
+            if (CloseDoorTimer <= diff)
             {
-                if(pInstance)
+                if (pInstance)
                 {
                     pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_LIBRARY_DOOR), false);
                     CloseDoorTimer = 0;
@@ -255,7 +255,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
         else FrostCooldown = 0;
         }
 
-        if(!Drinking && m_creature->GetMaxPower(POWER_MANA) && (m_creature->GetPower(POWER_MANA)*100 / m_creature->GetMaxPower(POWER_MANA)) < 20)
+        if (!Drinking && m_creature->GetMaxPower(POWER_MANA) && (m_creature->GetPower(POWER_MANA)*100 / m_creature->GetMaxPower(POWER_MANA)) < 20)
         {
             Drinking = true;
             m_creature->InterruptNonMeleeSpells(false);
@@ -300,7 +300,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
             return;
 
         //Normal casts
-        if(NormalCastTimer < diff)
+        if (NormalCastTimer < diff)
         {
             if (!m_creature->IsNonMeleeSpellCasted(false))
             {
@@ -339,7 +339,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
             NormalCastTimer = 1000;
         }else NormalCastTimer -= diff;
 
-        if(SecondarySpellTimer < diff)
+        if (SecondarySpellTimer < diff)
         {
             switch (rand()%2)
             {
@@ -355,7 +355,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
             SecondarySpellTimer = 5000 + (rand()%15000);
         }else SecondarySpellTimer -= diff;
 
-        if(SuperCastTimer < diff)
+        if (SuperCastTimer < diff)
         {
             uint8 Available[2];
 
@@ -426,7 +426,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
             SuperCastTimer = 35000 + (rand()%5000);
         }else SuperCastTimer -= diff;
 
-        if(!ElementalsSpawned && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 40)
+        if (!ElementalsSpawned && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 40)
         {
             ElementalsSpawned = true;
 
@@ -442,7 +442,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
             DoScriptText(SAY_ELEMENTALS, m_creature);
         }
 
-        if(BerserkTimer < diff)
+        if (BerserkTimer < diff)
         {
             for (uint32 i = 0; i < 5; ++i)
             {
@@ -532,10 +532,10 @@ struct TRINITY_DLL_DECL water_elementalAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(CastTimer < diff)
+        if (CastTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_WATERBOLT);
             CastTimer = 2000 + (rand()%3000);
diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp
index f039783c815..dbb8079468d 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp
@@ -82,26 +82,26 @@ struct TRINITY_DLL_DECL mob_kilrekAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(!pInstance)
+        if (!pInstance)
         {
             ERROR_INST_DATA(m_creature);
             return;
         }
 
         Creature* Terestian = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_TERESTIAN)));
-        if(Terestian && !Terestian->getVictim())
+        if (Terestian && !Terestian->getVictim())
             Terestian->AddThreat(who, 1.0f);
     }
 
     void JustDied(Unit* Killer)
     {
-        if(pInstance)
+        if (pInstance)
         {
             uint64 TerestianGUID = pInstance->GetData64(DATA_TERESTIAN);
-            if(TerestianGUID)
+            if (TerestianGUID)
             {
                 Unit* Terestian = Unit::GetUnit((*m_creature), TerestianGUID);
-                if(Terestian && Terestian->isAlive())
+                if (Terestian && Terestian->isAlive())
                     DoCast(Terestian, SPELL_BROKEN_PACT, true);
             }
         }else ERROR_INST_DATA(m_creature);
@@ -110,7 +110,7 @@ struct TRINITY_DLL_DECL mob_kilrekAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (AmplifyTimer < diff)
@@ -142,10 +142,10 @@ struct TRINITY_DLL_DECL mob_demon_chainAI : public ScriptedAI
 
     void JustDied(Unit *killer)
     {
-        if(SacrificeGUID)
+        if (SacrificeGUID)
         {
             Unit* Sacrifice = Unit::GetUnit((*m_creature),SacrificeGUID);
-            if(Sacrifice)
+            if (Sacrifice)
                 Sacrifice->RemoveAurasDueToSpell(SPELL_SACRIFICE);
         }
     }
@@ -180,9 +180,9 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
     {
         for(uint8 i = 0; i < 2; ++i)
         {
-            if(PortalGUID[i])
+            if (PortalGUID[i])
             {
-                if(Creature* pPortal = Unit::GetCreature(*m_creature, PortalGUID[i]))
+                if (Creature* pPortal = Unit::GetCreature(*m_creature, PortalGUID[i]))
                     pPortal->ForcedDespawn();
 
                 PortalGUID[i] = 0;
@@ -199,7 +199,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
         Berserk             = false;
         ReSummon            = false;
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(TYPE_TERESTIAN, NOT_STARTED);
     }
 
@@ -207,7 +207,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
     {
         DoScriptText(SAY_AGGRO, m_creature);
 
-        if(pInstance)
+        if (pInstance)
         {
             Creature* Kilrek = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_KILREK)));
             // Respawn Kil'rek on aggro if Kil'rek is dead.
@@ -217,7 +217,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
             }
 
             // Put Kil'rek in combat against our target so players don't skip him
-            if(Kilrek && !Kilrek->getVictim())
+            if (Kilrek && !Kilrek->getVictim())
                 Kilrek->AddThreat(who, 1.0f);
 
             pInstance->SetData(TYPE_TERESTIAN, IN_PROGRESS);
@@ -237,9 +237,9 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
     {
         for(uint8 i = 0; i < 2; ++i)
         {
-            if(PortalGUID[i])
+            if (PortalGUID[i])
             {
-                if(Creature* pPortal = Unit::GetCreature((*m_creature), PortalGUID[i]))
+                if (Creature* pPortal = Unit::GetCreature((*m_creature), PortalGUID[i]))
                     pPortal->ForcedDespawn();
 
                 PortalGUID[i] = 0;
@@ -248,29 +248,29 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
 
         DoScriptText(SAY_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(TYPE_TERESTIAN, DONE);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(CheckKilrekTimer < diff)
+        if (CheckKilrekTimer < diff)
         {
 
             CheckKilrekTimer = 5000;
 
-            if(pInstance)
+            if (pInstance)
                 uint64 KilrekGUID = pInstance->GetData64(DATA_KILREK);
             else ERROR_INST_DATA(m_creature);
 
             Creature* Kilrek = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_KILREK)));
-            if(SummonKilrek && Kilrek)
+            if (SummonKilrek && Kilrek)
             {
                 Kilrek->Respawn();
-                if(Kilrek->AI())
+                if (Kilrek->AI())
                 {
                     Kilrek->AI()->AttackStart(m_creature->getVictim());
                     m_creature->RemoveAurasDueToSpell(SPELL_BROKEN_PACT);
@@ -279,21 +279,21 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
                 SummonKilrek = false;
             }
 
-            if(!Kilrek || !Kilrek->isAlive())
+            if (!Kilrek || !Kilrek->isAlive())
             {
                 SummonKilrek = true;
                 CheckKilrekTimer = 45000;
             }
         }else CheckKilrekTimer -= diff;
 
-        if(SacrificeTimer < diff)
+        if (SacrificeTimer < diff)
         {
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-            if(target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER)
+            if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER)
             {
                 DoCast(target, SPELL_SACRIFICE, true);
                 Creature* Chains = m_creature->SummonCreature(CREATURE_DEMONCHAINS, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 21000);
-                if(Chains)
+                if (Chains)
                 {
                     CAST_AI(mob_demon_chainAI, Chains->AI())->SacrificeGUID = target->GetGUID();
                     Chains->CastSpell(Chains, SPELL_DEMON_CHAINS, true);
@@ -307,20 +307,20 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
             }
         }else SacrificeTimer -= diff;
 
-        if(ShadowboltTimer < diff)
+        if (ShadowboltTimer < diff)
         {
             DoCast(SelectUnit(SELECT_TARGET_TOPAGGRO, 0), SPELL_SHADOW_BOLT);
             ShadowboltTimer = 10000;
         }else ShadowboltTimer -= diff;
 
-        if(SummonTimer < diff)
+        if (SummonTimer < diff)
         {
-            if(!SummonedPortals)
+            if (!SummonedPortals)
             {
                 for(uint8 i = 0; i < 2; ++i)
                 {
                     Creature* Portal = m_creature->SummonCreature(CREATURE_PORTAL, PortalLocations[i][0], PortalLocations[i][1], PORTAL_Z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
-                    if(Portal)
+                    if (Portal)
                         PortalGUID[i] = Portal->GetGUID();
                 }
                 SummonedPortals = true;
@@ -332,7 +332,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
             }
             uint32 random = rand()%2;
             Creature* Imp = m_creature->SummonCreature(CREATURE_FIENDISHIMP, PortalLocations[random][0], PortalLocations[random][1], PORTAL_Z, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 15000);
-            if(Imp)
+            if (Imp)
             {
                 Imp->AddThreat(m_creature->getVictim(), 1.0f);
                 Imp->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 1));
@@ -340,9 +340,9 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
             SummonTimer = 5000;
         }else SummonTimer -= diff;
 
-        if(!Berserk)
+        if (!Berserk)
         {
-            if(BerserkTimer < diff)
+            if (BerserkTimer < diff)
             {
                 DoCast(m_creature, SPELL_BERSERK);
                 Berserk = true;
@@ -373,10 +373,10 @@ struct TRINITY_DLL_DECL mob_fiendish_impAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(FireboltTimer < diff)
+        if (FireboltTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_FIREBOLT);
             FireboltTimer = 2200;
diff --git a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp
index c0634295063..f6d3fd0f4df 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp
@@ -90,11 +90,11 @@ void SummonCroneIfReady(ScriptedInstance* pInstance, Creature* pCreature)
 {
     pInstance->SetData(DATA_OPERA_OZ_DEATHCOUNT, SPECIAL);  // Increment DeathCount
 
-    if(pInstance->GetData(DATA_OPERA_OZ_DEATHCOUNT) == 4)
+    if (pInstance->GetData(DATA_OPERA_OZ_DEATHCOUNT) == 4)
     {
         if (Creature* pCrone = pCreature->SummonCreature(CREATURE_CRONE, -10891.96, -1755.95, pCreature->GetPositionZ(), 4.64, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILISECONDS))
         {
-            if(pCreature->getVictim())
+            if (pCreature->getVictim())
                 pCrone->AI()->AttackStart(pCreature->getVictim());
         }
     }
@@ -146,13 +146,13 @@ struct TRINITY_DLL_DECL boss_dorotheeAI : public ScriptedAI
     {
         DoScriptText(SAY_DOROTHEE_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             SummonCroneIfReady(pInstance, m_creature);
     }
 
     void AttackStart(Unit* who)
     {
-        if(m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::AttackStart(who);
@@ -160,7 +160,7 @@ struct TRINITY_DLL_DECL boss_dorotheeAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit* who)
     {
-        if(m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::MoveInLineOfSight(who);
@@ -168,33 +168,33 @@ struct TRINITY_DLL_DECL boss_dorotheeAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(AggroTimer)
+        if (AggroTimer)
         {
-            if(AggroTimer <= diff)
+            if (AggroTimer <= diff)
             {
                 m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 AggroTimer = 0;
             }else AggroTimer -= diff;
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(WaterBoltTimer < diff)
+        if (WaterBoltTimer < diff)
         {
             DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_WATERBOLT);
             WaterBoltTimer = TitoDied ? 1500 : 5000;
         }else WaterBoltTimer -= diff;
 
-        if(FearTimer < diff)
+        if (FearTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SCREAM);
             FearTimer = 30000;
         }else FearTimer -= diff;
 
-        if(!SummonedTito)
+        if (!SummonedTito)
         {
-            if(SummonTitoTimer < diff)
+            if (SummonTitoTimer < diff)
                 SummonTito();
             else SummonTitoTimer -= diff;
         }
@@ -220,10 +220,10 @@ struct TRINITY_DLL_DECL mob_titoAI : public ScriptedAI
 
     void JustDied(Unit* killer)
     {
-        if(DorotheeGUID)
+        if (DorotheeGUID)
         {
             Creature* Dorothee = (Unit::GetCreature((*m_creature), DorotheeGUID));
-            if(Dorothee && Dorothee->isAlive())
+            if (Dorothee && Dorothee->isAlive())
             {
                 CAST_AI(boss_dorotheeAI, Dorothee->AI())->TitoDied = true;
                 DoScriptText(SAY_DOROTHEE_TITO_DEATH, Dorothee);
@@ -233,10 +233,10 @@ struct TRINITY_DLL_DECL mob_titoAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(YipTimer < diff)
+        if (YipTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_YIPPING);
             YipTimer = 10000;
@@ -280,7 +280,7 @@ struct TRINITY_DLL_DECL boss_strawmanAI : public ScriptedAI
 
     void AttackStart(Unit* who)
     {
-        if(m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::AttackStart(who);
@@ -288,7 +288,7 @@ struct TRINITY_DLL_DECL boss_strawmanAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit* who)
     {
-        if(m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::MoveInLineOfSight(who);
@@ -321,7 +321,7 @@ struct TRINITY_DLL_DECL boss_strawmanAI : public ScriptedAI
     {
         DoScriptText(SAY_STRAWMAN_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             SummonCroneIfReady(pInstance, m_creature);
     }
 
@@ -332,25 +332,25 @@ struct TRINITY_DLL_DECL boss_strawmanAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(AggroTimer)
+        if (AggroTimer)
         {
-            if(AggroTimer <= diff)
+            if (AggroTimer <= diff)
             {
                 m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 AggroTimer = 0;
             }else AggroTimer -= diff;
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(BrainBashTimer < diff)
+        if (BrainBashTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_BRAIN_BASH);
             BrainBashTimer = 15000;
         }else BrainBashTimer -= diff;
 
-        if(BrainWipeTimer < diff)
+        if (BrainWipeTimer < diff)
         {
             DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_BRAIN_WIPE);
             BrainWipeTimer = 20000;
@@ -396,7 +396,7 @@ struct TRINITY_DLL_DECL boss_tinheadAI : public ScriptedAI
 
     void AttackStart(Unit* who)
     {
-        if(m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::AttackStart(who);
@@ -404,7 +404,7 @@ struct TRINITY_DLL_DECL boss_tinheadAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit* who)
     {
-        if(m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::MoveInLineOfSight(who);
@@ -414,7 +414,7 @@ struct TRINITY_DLL_DECL boss_tinheadAI : public ScriptedAI
     {
         DoScriptText(SAY_TINHEAD_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             SummonCroneIfReady(pInstance, m_creature);
     }
 
@@ -425,27 +425,27 @@ struct TRINITY_DLL_DECL boss_tinheadAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(AggroTimer)
+        if (AggroTimer)
         {
-            if(AggroTimer < diff)
+            if (AggroTimer < diff)
             {
                 m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 AggroTimer = 0;
             }else AggroTimer -= diff;
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(CleaveTimer < diff)
+        if (CleaveTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_CLEAVE);
             CleaveTimer = 5000;
         }else CleaveTimer -= diff;
 
-        if(RustCount < 8)
+        if (RustCount < 8)
         {
-            if(RustTimer < diff)
+            if (RustTimer < diff)
             {
                 RustCount++;
                  DoScriptText(EMOTE_RUST, m_creature);
@@ -482,7 +482,7 @@ struct TRINITY_DLL_DECL boss_roarAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit* who)
     {
-        if(m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::MoveInLineOfSight(who);
@@ -490,7 +490,7 @@ struct TRINITY_DLL_DECL boss_roarAI : public ScriptedAI
 
     void AttackStart(Unit* who)
     {
-        if(m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::AttackStart(who);
@@ -510,7 +510,7 @@ struct TRINITY_DLL_DECL boss_roarAI : public ScriptedAI
     {
         DoScriptText(SAY_ROAR_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             SummonCroneIfReady(pInstance, m_creature);
     }
 
@@ -521,31 +521,31 @@ struct TRINITY_DLL_DECL boss_roarAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(AggroTimer)
+        if (AggroTimer)
         {
-            if(AggroTimer <= diff)
+            if (AggroTimer <= diff)
             {
                 m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 AggroTimer = 0;
             }else AggroTimer -= diff;
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(MangleTimer < diff)
+        if (MangleTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_MANGLE);
             MangleTimer = 5000 + rand()%3000;
         }else MangleTimer -= diff;
 
-        if(ShredTimer < diff)
+        if (ShredTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SHRED);
             ShredTimer = 10000 + rand()%5000;
         }else ShredTimer -= diff;
 
-        if(ScreamTimer < diff)
+        if (ScreamTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_FRIGHTENED_SCREAM);
             ScreamTimer = 20000 + rand()%10000;
@@ -593,7 +593,7 @@ struct TRINITY_DLL_DECL boss_croneAI : public ScriptedAI
     {
         DoScriptText(SAY_CRONE_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(TYPE_OPERA, DONE);
             pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORLEFT), true);
@@ -606,21 +606,21 @@ struct TRINITY_DLL_DECL boss_croneAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
 
-        if(CycloneTimer < diff)
+        if (CycloneTimer < diff)
         {
             Creature* Cyclone = DoSpawnCreature(CREATURE_CYCLONE, rand()%10, rand()%10, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000);
-            if(Cyclone)
+            if (Cyclone)
                 Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_VISUAL, true);
             CycloneTimer = 30000;
         }else CycloneTimer -= diff;
 
-        if(ChainLightningTimer < diff)
+        if (ChainLightningTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_CHAIN_LIGHTNING);
             ChainLightningTimer = 15000;
@@ -649,10 +649,10 @@ struct TRINITY_DLL_DECL mob_cycloneAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->HasAura(SPELL_KNOCKBACK))
+        if (!m_creature->HasAura(SPELL_KNOCKBACK))
             DoCast(m_creature, SPELL_KNOCKBACK, true);
 
-        if(MoveTimer < diff)
+        if (MoveTimer < diff)
         {
             float x,y,z;
             m_creature->GetPosition(x,y,z);
@@ -719,17 +719,17 @@ CreatureAI* GetAI_mob_cyclone(Creature* _Creature)
 /**** The Wolf's Entry ****/
 #define CREATURE_BIG_BAD_WOLF           17521
 
-bool GossipHello_npc_grandmother(Player* player, Creature* _Creature)
+bool GossipHello_npc_grandmother(Player* pPlayer, Creature* _Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GRANDMA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
-    player->SEND_GOSSIP_MENU(8990, _Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GRANDMA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    pPlayer->SEND_GOSSIP_MENU(8990, _Creature->GetGUID());
 
     return true;
 }
 
 bool GossipSelect_npc_grandmother(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action)
 {
-    if(action == GOSSIP_ACTION_INFO_DEF)
+    if (action == GOSSIP_ACTION_INFO_DEF)
     {
         if (Creature* pBigBadWolf = pCreature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILISECONDS))
             pBigBadWolf->AI()->AttackStart(pPlayer);
@@ -784,7 +784,7 @@ struct TRINITY_DLL_DECL boss_bigbadwolfAI : public ScriptedAI
     {
         DoPlaySoundToSet(m_creature, SOUND_WOLF_DEATH);
 
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(TYPE_OPERA, DONE);
             pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORLEFT), true);
@@ -797,23 +797,23 @@ struct TRINITY_DLL_DECL boss_bigbadwolfAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
 
-        if(ChaseTimer < diff)
+        if (ChaseTimer < diff)
         {
-            if(!IsChasing)
+            if (!IsChasing)
             {
                 Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                if(target && target->GetTypeId() == TYPEID_PLAYER)
+                if (target && target->GetTypeId() == TYPEID_PLAYER)
                 {
                     DoScriptText(SAY_WOLF_HOOD, m_creature);
 
                     DoCast(target, SPELL_LITTLE_RED_RIDING_HOOD, true);
                     TempThreat = DoGetThreat(target);
-                    if(TempThreat)
+                    if (TempThreat)
                         DoModifyThreatPercent(target, -100);
                     HoodGUID = target->GetGUID();
                     m_creature->AddThreat(target, 1000000.0f);
@@ -828,7 +828,7 @@ struct TRINITY_DLL_DECL boss_bigbadwolfAI : public ScriptedAI
                 if (Unit* target = Unit::GetUnit((*m_creature), HoodGUID))
                 {
                     HoodGUID = 0;
-                    if(DoGetThreat(target))
+                    if (DoGetThreat(target))
                         DoModifyThreatPercent(target, -100);
                     m_creature->AddThreat(target, TempThreat);
                     TempThreat = 0;
@@ -838,16 +838,16 @@ struct TRINITY_DLL_DECL boss_bigbadwolfAI : public ScriptedAI
             }
         }else ChaseTimer -= diff;
 
-        if(IsChasing)
+        if (IsChasing)
             return;
 
-        if(FearTimer < diff)
+        if (FearTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_TERRIFYING_HOWL);
             FearTimer = 25000 + rand()%10000;
         }else FearTimer -= diff;
 
-        if(SwipeTimer < diff)
+        if (SwipeTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_WIDE_SWIPE);
             SwipeTimer = 25000 + rand()%5000;
@@ -925,7 +925,7 @@ void Resurrect(Creature* target)
     target->SetHealth(target->GetMaxHealth());
     target->SetStandState(UNIT_STAND_STATE_STAND);
     target->CastSpell(target, SPELL_RES_VISUAL, true);
-    if(target->getVictim())
+    if (target->getVictim())
     {
         target->GetMotionMaster()->MoveChase(target->getVictim());
         target->AI()->AttackStart(target->getVictim());
@@ -979,7 +979,7 @@ struct TRINITY_DLL_DECL boss_julianneAI : public ScriptedAI
         DrinkPoisonTimer = 0;
         ResurrectSelfTimer = 0;
 
-        if(IsFakingDeath)
+        if (IsFakingDeath)
         {
             Resurrect(m_creature);
             IsFakingDeath = false;
@@ -993,7 +993,7 @@ struct TRINITY_DLL_DECL boss_julianneAI : public ScriptedAI
 
     void AttackStart(Unit* who)
     {
-        if(m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::AttackStart(who);
@@ -1001,7 +1001,7 @@ struct TRINITY_DLL_DECL boss_julianneAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit* who)
     {
-        if(m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::MoveInLineOfSight(who);
@@ -1027,7 +1027,7 @@ struct TRINITY_DLL_DECL boss_julianneAI : public ScriptedAI
     {
         DoScriptText(SAY_JULIANNE_DEATH02, m_creature);
 
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(TYPE_OPERA, DONE);
             pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_STAGEDOORLEFT), true);
@@ -1095,10 +1095,10 @@ struct TRINITY_DLL_DECL boss_romuloAI : public ScriptedAI
     void EnterCombat(Unit* who)
     {
         DoScriptText(SAY_ROMULO_AGGRO, m_creature);
-        if(JulianneGUID)
+        if (JulianneGUID)
         {
             Creature* Julianne = (Unit::GetCreature((*m_creature), JulianneGUID));
-            if(Julianne && Julianne->getVictim())
+            if (Julianne && Julianne->getVictim())
             {
                 m_creature->AddThreat(Julianne->getVictim(), 1.0f);
                 AttackStart(Julianne->getVictim());
@@ -1108,7 +1108,7 @@ struct TRINITY_DLL_DECL boss_romuloAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit* who)
     {
-        if(m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::MoveInLineOfSight(who);
@@ -1144,7 +1144,7 @@ void boss_julianneAI::DamageTaken(Unit* done_by, uint32 &damage)
 
     //anything below only used if incoming damage will kill
 
-    if(Phase == PHASE_JULIANNE)
+    if (Phase == PHASE_JULIANNE)
     {
         damage = 0;
 
@@ -1255,7 +1255,7 @@ void boss_romuloAI::DamageTaken(Unit* done_by, uint32 &damage)
 
 void boss_julianneAI::UpdateAI(const uint32 diff)
 {
-    if(EntryYellTimer)
+    if (EntryYellTimer)
     {
         if (EntryYellTimer <= diff)
         {
@@ -1264,7 +1264,7 @@ void boss_julianneAI::UpdateAI(const uint32 diff)
         }else EntryYellTimer -= diff;
     }
 
-    if(AggroYellTimer)
+    if (AggroYellTimer)
     {
         if (AggroYellTimer <= diff)
         {
@@ -1289,7 +1289,7 @@ void boss_julianneAI::UpdateAI(const uint32 diff)
     
     if (Phase == PHASE_ROMULO && !SummonedRomulo)
     {
-        if(SummonRomuloTimer < diff)
+        if (SummonRomuloTimer < diff)
         {
             if (Creature* pRomulo = m_creature->SummonCreature(CREATURE_ROMULO, ROMULO_X, ROMULO_Y, m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILISECONDS))
             {
@@ -1320,15 +1320,15 @@ void boss_julianneAI::UpdateAI(const uint32 diff)
         }else ResurrectSelfTimer -= diff;
     }
     
-    if(!UpdateVictim() || IsFakingDeath)
+    if (!UpdateVictim() || IsFakingDeath)
         return;
 
-    if(RomuloDead)
+    if (RomuloDead)
     {
-        if(ResurrectTimer < diff)
+        if (ResurrectTimer < diff)
         {
             Creature* Romulo = (Unit::GetCreature((*m_creature), RomuloGUID));
-            if(Romulo && CAST_AI(boss_romuloAI, Romulo->AI())->IsFakingDeath)
+            if (Romulo && CAST_AI(boss_romuloAI, Romulo->AI())->IsFakingDeath)
             {
                 DoScriptText(SAY_JULIANNE_RESURRECT, m_creature);
                 Resurrect(Romulo);
@@ -1339,27 +1339,27 @@ void boss_julianneAI::UpdateAI(const uint32 diff)
         }else ResurrectTimer -= diff;
     }
 
-    if(BlindingPassionTimer < diff)
+    if (BlindingPassionTimer < diff)
     {
         DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_BLINDING_PASSION);
         BlindingPassionTimer = 30000 + rand()%15000;
     }else BlindingPassionTimer -= diff;
 
-    if(DevotionTimer < diff)
+    if (DevotionTimer < diff)
     {
         DoCast(m_creature, SPELL_DEVOTION);
         DevotionTimer = 15000 + rand()%30000;
     }else DevotionTimer -= diff;
 
-    if(PowerfulAttractionTimer < diff)
+    if (PowerfulAttractionTimer < diff)
     {
         DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_POWERFUL_ATTRACTION);
         PowerfulAttractionTimer = 5000 + rand()%25000;
     }else PowerfulAttractionTimer -= diff;
 
-    if(EternalAffectionTimer < diff)
+    if (EternalAffectionTimer < diff)
     {
-        if(rand()%2 == 1 && SummonedRomulo)
+        if (rand()%2 == 1 && SummonedRomulo)
         {
             Creature* Romulo = (Unit::GetCreature((*m_creature), RomuloGUID));
             if (Romulo && Romulo->isAlive() && !RomuloDead)
@@ -1374,15 +1374,15 @@ void boss_julianneAI::UpdateAI(const uint32 diff)
 
 void boss_romuloAI::UpdateAI(const uint32 diff)
 {
-    if(!UpdateVictim() || IsFakingDeath)
+    if (!UpdateVictim() || IsFakingDeath)
         return;
 
-    if(JulianneDead)
+    if (JulianneDead)
     {
-        if(ResurrectTimer < diff)
+        if (ResurrectTimer < diff)
         {
             Creature* Julianne = (Unit::GetCreature((*m_creature), JulianneGUID));
-            if(Julianne && CAST_AI(boss_julianneAI, Julianne->AI())->IsFakingDeath)
+            if (Julianne && CAST_AI(boss_julianneAI, Julianne->AI())->IsFakingDeath)
             {
                 DoScriptText(SAY_ROMULO_RESURRECT, m_creature);
                 Resurrect(Julianne);
@@ -1393,29 +1393,29 @@ void boss_romuloAI::UpdateAI(const uint32 diff)
         }else ResurrectTimer -= diff;
     }
 
-    if(BackwardLungeTimer < diff)
+    if (BackwardLungeTimer < diff)
     {
         Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-        if(target && !m_creature->HasInArc(M_PI, target))
+        if (target && !m_creature->HasInArc(M_PI, target))
         {
             DoCast(target, SPELL_BACKWARD_LUNGE);
             BackwardLungeTimer = 15000 + rand()%15000;
         }
     }else BackwardLungeTimer -= diff;
 
-    if(DaringTimer < diff)
+    if (DaringTimer < diff)
     {
         DoCast(m_creature, SPELL_DARING);
         DaringTimer = 20000 + rand()%20000;
     }else DaringTimer -= diff;
 
-    if(DeadlySwatheTimer < diff)
+    if (DeadlySwatheTimer < diff)
     {
         DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DEADLY_SWATHE);
         DeadlySwatheTimer = 15000 + rand()%10000;
     }else DeadlySwatheTimer -= diff;
 
-    if(PoisonThrustTimer < diff)
+    if (PoisonThrustTimer < diff)
     {
         DoCast(m_creature->getVictim(), SPELL_POISON_THRUST);
         PoisonThrustTimer = 10000 + rand()%10000;
diff --git a/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp
index 813e8181901..4fdf2c24069 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp
@@ -43,7 +43,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance
 {
-    instance_karazhan(Map* map) : ScriptedInstance(map) {Initialize();}
+    instance_karazhan(Map* pMap) : ScriptedInstance(pMap) {Initialize();}
 
     uint32 m_auiEncounter[ENCOUNTERS];
     std::string strSaveData;
@@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance
                 break;
         }
 
-        if(uiData == DONE)
+        if (uiData == DONE)
         {
             OUT_SAVE_INST_DATA;
 
@@ -288,15 +288,15 @@ struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance
             >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7]
             >> m_auiEncounter[8] >> m_auiEncounter[9] >> m_auiEncounter[10] >> m_auiEncounter[11];
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(m_auiEncounter[i] == IN_PROGRESS)                // Do not load an encounter as "In Progress" - reset it instead.
+            if (m_auiEncounter[i] == IN_PROGRESS)                // Do not load an encounter as "In Progress" - reset it instead.
                 m_auiEncounter[i] = NOT_STARTED;
         OUT_LOAD_INST_DATA_COMPLETE;
     }
 };
 
-InstanceData* GetInstanceData_instance_karazhan(Map* map)
+InstanceData* GetInstanceData_instance_karazhan(Map* pMap)
 {
-    return new instance_karazhan(map);
+    return new instance_karazhan(pMap);
 }
 
 void AddSC_instance_karazhan()
diff --git a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp
index ef55e075c25..0fc5d6b82df 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp
@@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
 
         PerformanceReady = false;
 
-        if(pInstance)
+        if (pInstance)
             m_uiEventId = pInstance->GetData(DATA_OPERA_PERFORMANCE);
     }
 
@@ -195,26 +195,26 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
             case EVENT_OZ:
                 if (OzDialogue[count].textid)
                      text = OzDialogue[count].textid;
-                if(OzDialogue[count].timer)
+                if (OzDialogue[count].timer)
                     TalkTimer = OzDialogue[count].timer;
                 break;
 
             case EVENT_HOOD:
                 if (HoodDialogue[count].textid)
                     text = HoodDialogue[count].textid;
-                if(HoodDialogue[count].timer)
+                if (HoodDialogue[count].timer)
                     TalkTimer = HoodDialogue[count].timer;
                 break;
 
             case EVENT_RAJ:
                  if (RAJDialogue[count].textid)
                      text = RAJDialogue[count].textid;
-                if(RAJDialogue[count].timer)
+                if (RAJDialogue[count].timer)
                     TalkTimer = RAJDialogue[count].timer;
                 break;
         }
 
-        if(text)
+        if (text)
              DoScriptText(text, m_creature);
     }
 
@@ -260,11 +260,11 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
     {
         npc_escortAI::UpdateAI(diff);
 
-        if(IsOnHold)
+        if (IsOnHold)
         {
-            if(TalkTimer < diff)
+            if (TalkTimer < diff)
             {
-                if(TalkCount > 3)
+                if (TalkCount > 3)
                 {
                     if (Creature* pSpotlight = Unit::GetCreature(*m_creature, m_uiSpotlightGUID))
                         pSpotlight->ForcedDespawn();
@@ -280,17 +280,17 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
                 TalkTimer -= diff;
         }
 
-        if(PerformanceReady)
+        if (PerformanceReady)
         {
-            if(!RaidWiped)
+            if (!RaidWiped)
             {
-                if(WipeTimer < diff)
+                if (WipeTimer < diff)
                 {
-                    Map *map = m_creature->GetMap();
-                    if(!map->IsDungeon()) return;
+                    Map* pMap = m_creature->GetMap();
+                    if (!pMap->IsDungeon()) return;
 
-                    Map::PlayerList const &PlayerList = map->GetPlayers();
-                    if(PlayerList.isEmpty())
+                    Map::PlayerList const &PlayerList = pMap->GetPlayers();
+                    if (PlayerList.isEmpty())
                         return;
 
                     RaidWiped = true;
@@ -303,7 +303,7 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
                         }
                     }
 
-                    if(RaidWiped)
+                    if (RaidWiped)
                     {
                         RaidWiped = true;
                         EnterEvadeMode();
@@ -359,34 +359,34 @@ bool GossipHello_npc_barnes(Player* pPlayer, Creature* pCreature)
     return true;
 }
 
-bool GossipSelect_npc_barnes(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_barnes(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     npc_barnesAI* pBarnesAI = CAST_AI(npc_barnesAI,_Creature->AI());
 
     switch(action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->SEND_GOSSIP_MENU(8971, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(8971, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CLOSE_GOSSIP_MENU();
             pBarnesAI->StartEvent();
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CLOSE_GOSSIP_MENU();
             pBarnesAI->m_uiEventId = EVENT_OZ;
-            outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_OZ",player->GetGUID());
+            outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_OZ",pPlayer->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CLOSE_GOSSIP_MENU();
             pBarnesAI->m_uiEventId = EVENT_HOOD;
-            outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_HOOD",player->GetGUID());
+            outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_HOOD",pPlayer->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CLOSE_GOSSIP_MENU();
             pBarnesAI->m_uiEventId = EVENT_RAJ;
-            outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_RAJ",player->GetGUID());
+            outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_RAJ",pPlayer->GetGUID());
             break;
     }
 
@@ -417,12 +417,12 @@ bool GossipHello_npc_berthold(Player* pPlayer, Creature* pCreature)
     return true;
 }
 
-bool GossipSelect_npc_berthold(Player* player, Creature* _Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_berthold(Player* pPlayer, Creature* _Creature, uint32 sender, uint32 action)
 {
-    if(action == GOSSIP_ACTION_INFO_DEF + 1)
-        player->CastSpell(player, SPELL_TELEPORT, true);
+    if (action == GOSSIP_ACTION_INFO_DEF + 1)
+        pPlayer->CastSpell(pPlayer, SPELL_TELEPORT, true);
 
-    player->CLOSE_GOSSIP_MENU();
+    pPlayer->CLOSE_GOSSIP_MENU();
     return true;
 }
 
@@ -471,7 +471,7 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
     {
         ArcanagosGUID = 0;
 
-        if(pInstance && pInstance->GetData64(DATA_IMAGE_OF_MEDIVH) == 0)
+        if (pInstance && pInstance->GetData64(DATA_IMAGE_OF_MEDIVH) == 0)
         {
             pInstance->SetData64(DATA_IMAGE_OF_MEDIVH, m_creature->GetGUID());
             (*m_creature).GetMotionMaster()->MovePoint(1,MedivPos[0],MedivPos[1],MedivPos[2]);
@@ -486,9 +486,9 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
 
     void MovementInform(uint32 type, uint32 id)
     {
-        if(type != POINT_MOTION_TYPE)
+        if (type != POINT_MOTION_TYPE)
             return;
-        if(id == 1)
+        if (id == 1)
         {
             StartEvent();
             m_creature->SetOrientation(MedivPos[3]);
@@ -501,7 +501,7 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
         Step = 1;
         EventStarted = true;
         Creature* Arcanagos = m_creature->SummonCreature(MOB_ARCANAGOS,ArcanagosPos[0],ArcanagosPos[1],ArcanagosPos[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000);
-        if(!Arcanagos)
+        if (!Arcanagos)
             return;
         ArcanagosGUID = Arcanagos->GetGUID();
         Arcanagos->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
@@ -515,7 +515,7 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
     uint32 NextStep(uint32 Step)
     {
         Unit* arca = Unit::GetUnit((*m_creature),ArcanagosGUID);
-        Map *map = m_creature->GetMap();
+        Map* pMap = m_creature->GetMap();
         switch(Step)
         {
         case 0: return 9999999;
@@ -523,21 +523,21 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
             m_creature->MonsterYell(SAY_DIALOG_MEDIVH_1,LANG_UNIVERSAL,NULL);
             return 10000;
         case 2:
-            if(arca)
+            if (arca)
                 CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_2,LANG_UNIVERSAL,NULL);
             return 20000;
         case 3:
             m_creature->MonsterYell(SAY_DIALOG_MEDIVH_3,LANG_UNIVERSAL,NULL);
             return 10000;
         case 4:
-            if(arca)
+            if (arca)
                 CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_4, LANG_UNIVERSAL, NULL);
             return 20000;
         case 5:
             m_creature->MonsterYell(SAY_DIALOG_MEDIVH_5, LANG_UNIVERSAL, NULL);
             return 20000;
         case 6:
-            if(arca)
+            if (arca)
                 CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_6, LANG_UNIVERSAL, NULL);
             return 10000;
         case 7:
@@ -551,11 +551,11 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
             m_creature->MonsterTextEmote(EMOTE_DIALOG_MEDIVH_7, 0, false);
             return 10000;
         case 10:
-            if(arca)
+            if (arca)
                 m_creature->CastSpell(arca, SPELL_CONFLAGRATION_BLAST, false);
             return 1000;
         case 11:
-            if(arca)
+            if (arca)
                 CAST_CRE(arca)->MonsterYell(SAY_DIALOG_ARCANAGOS_8, LANG_UNIVERSAL, NULL);
             return 5000;
         case 12:
@@ -571,14 +571,14 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
             m_creature->SetVisibility(VISIBILITY_OFF);
             m_creature->ClearInCombat();
 
-            if(map->IsDungeon())
+            if (pMap->IsDungeon())
             {
-                InstanceMap::PlayerList const &PlayerList = map->GetPlayers();
+                InstanceMap::PlayerList const &PlayerList = pMap->GetPlayers();
                 for (InstanceMap::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
                 {
-                    if(i->getSource()->isAlive())
+                    if (i->getSource()->isAlive())
                     {
-                        if(i->getSource()->GetQuestStatus(9645) == QUEST_STATUS_INCOMPLETE)
+                        if (i->getSource()->GetQuestStatus(9645) == QUEST_STATUS_INCOMPLETE)
                             i->getSource()->CompleteQuest(9645);
                     }
                 }
@@ -595,28 +595,28 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
 
-        if(YellTimer < diff)
+        if (YellTimer < diff)
         {
-            if(EventStarted)
+            if (EventStarted)
             {
                 YellTimer = NextStep(Step++);
             }
         }else YellTimer -= diff;
 
-        if(Step >= 7 && Step <= 12 )
+        if (Step >= 7 && Step <= 12)
         {
             Unit* arca = Unit::GetUnit((*m_creature),ArcanagosGUID);
 
-            if(FireArcanagosTimer < diff)
+            if (FireArcanagosTimer < diff)
             {
-                if(arca)
+                if (arca)
                     arca->CastSpell(m_creature, SPELL_FIRE_BALL, false);
                 FireArcanagosTimer = 6000;
             }else FireArcanagosTimer -= diff;
 
-            if(FireMedivhTimer < diff)
+            if (FireMedivhTimer < diff)
             {
-                if(arca)
+                if (arca)
                     DoCast(arca, SPELL_FIRE_BALL);
                 FireMedivhTimer = 5000;
             }else FireMedivhTimer -= diff;
diff --git a/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp b/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp
index e80a6bf3061..911b10bd6fa 100644
--- a/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp
+++ b/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp
@@ -40,49 +40,49 @@ EndContentData */
 #define GOSSIP_MP5 "Ok, i'll try to remember that."
 #define GOSSIP_MP6 "A key? Ok!"
 
-bool GossipHello_npc_mountaineer_pebblebitty(Player *player, Creature *_Creature)
+bool GossipHello_npc_mountaineer_pebblebitty(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (!player->GetQuestRewardStatus(3181) == 1)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (!pPlayer->GetQuestRewardStatus(3181) == 1)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_mountaineer_pebblebitty(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_mountaineer_pebblebitty(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(1833, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(1833, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(1834, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(1834, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->SEND_GOSSIP_MENU(1835, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(1835, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->SEND_GOSSIP_MENU(1836, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(1836, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->SEND_GOSSIP_MENU(1837, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->SEND_GOSSIP_MENU(1837, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+6:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->SEND_GOSSIP_MENU(1838, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(1838, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+7:
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp
index 718881759bb..dc64e354519 100644
--- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp
+++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp
@@ -231,11 +231,11 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(ResetTimer < diff)
+        if (ResetTimer < diff)
         {
             float x, y, z, o;
             m_creature->GetHomePosition(x, y, z, o);
-            if(m_creature->GetPositionZ() >= z+10)
+            if (m_creature->GetPositionZ() >= z+10)
             {
                 EnterEvadeMode();
                 return;
@@ -276,7 +276,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
             RenewTimer = 5000;
         }else RenewTimer -= diff;
 
-        if(ShieldTimer < diff)
+        if (ShieldTimer < diff)
         {
             Unit* target = m_creature;
 
@@ -1144,10 +1144,10 @@ struct TRINITY_DLL_DECL boss_apokoAI : public boss_priestess_lackey_commonAI
         {
             // std::vector<Add*>::iterator itr = Group.begin() + rand()%Group.size();
             // uint64 guid = (*itr)->guid;
-            // if(guid)
+            // if (guid)
             // {
             //   Unit* pAdd = Unit::GetUnit(*m_creature, (*itr)->guid);
-            //   if(pAdd && pAdd->isAlive())
+            //   if (pAdd && pAdd->isAlive())
             //   {
             DoCast(m_creature, SPELL_LESSER_HEALING_WAVE);
             Healing_Wave_Timer = 5000;
@@ -1269,7 +1269,7 @@ CreatureAI* GetAI_zelfan(Creature* pCreature)
 //
 //    void UpdateAI(const uint32 diff)
 //    {
-//        if(Explosion_Timer < diff)
+//        if (Explosion_Timer < diff)
 //        {
 //            DoCast(m_creature->getVictim(), SPELL_SHEEP_EXPLOSION);
 //        }else
diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp
index f09a16aa171..17cd4a2ad5c 100644
--- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp
+++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp
@@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
                 Unit* pUnit = Unit::GetUnit(*m_creature, *itr);
                 if (pUnit)
                 {
-                    if(!pUnit->isAlive())
+                    if (!pUnit->isAlive())
                         CAST_CRE(pUnit)->Respawn();      // Let MaNGOS handle setting death state, etc.
 
                     // Only need to set unselectable flag. You can't attack unselectable units so non_attackable flag is not necessary here.
@@ -142,7 +142,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
             if (pCrystal && pCrystal->isAlive())
             {
                 // select nearest
-                if(!CrystalChosen || m_creature->GetDistanceOrder(pCrystal, CrystalChosen, false))
+                if (!CrystalChosen || m_creature->GetDistanceOrder(pCrystal, CrystalChosen, false))
                 {
                     CrystalGUID = pCrystal->GetGUID();
                     CrystalChosen = pCrystal;               // Store a copy of pCrystal so we don't need to recreate a pointer to closest crystal for the movement and yell.
@@ -331,7 +331,7 @@ struct TRINITY_DLL_DECL mob_fel_crystalAI : public ScriptedAI
             Creature* Selin = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_SELIN)));
             if (Selin && Selin->isAlive())
             {
-                if(CAST_AI(boss_selin_fireheartAI, Selin->AI())->CrystalGUID == m_creature->GetGUID())
+                if (CAST_AI(boss_selin_fireheartAI, Selin->AI())->CrystalGUID == m_creature->GetGUID())
                 {
                     // Set this to false if we are the creature that Selin is draining so his AI flows properly
                     CAST_AI(boss_selin_fireheartAI, Selin->AI())->DrainingCrystal = false;
diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp
index d641edb36f4..e4c9e6e0377 100644
--- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp
+++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_vexallus.cpp
@@ -116,7 +116,7 @@ struct  TRINITY_DLL_DECL boss_vexallusAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (!Enraged)
@@ -162,7 +162,7 @@ struct  TRINITY_DLL_DECL boss_vexallusAI : public ScriptedAI
             if (ArcaneShockTimer < diff)
             {
                 if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
-                if(target)
+                if (target)
                     DoCast(target, Heroic ? SPELL_H_ARCANE_SHOCK : SPELL_ARCANE_SHOCK);
 
                 ArcaneShockTimer = 8000;
diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp
index 09dc31d35dc..7fe549c1425 100644
--- a/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp
+++ b/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp
@@ -35,7 +35,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance
 {
-    instance_magisters_terrace(Map* map) : ScriptedInstance(map) {Initialize();}
+    instance_magisters_terrace(Map* pMap) : ScriptedInstance(pMap) {Initialize();}
 
     uint32 Encounters[NUMBER_OF_ENCOUNTERS];
     uint32 DelrissaDeathCount;
@@ -79,7 +79,7 @@ struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS)
+            if (Encounters[i] == IN_PROGRESS)
                 return true;
         return false;
     }
@@ -168,13 +168,13 @@ struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance
 
             case DATA_FEL_CRYSTAL:
             {
-                if(FelCrystals.empty())
+                if (FelCrystals.empty())
                 {
                     error_log("TSCR: Magisters Terrace: No Fel Crystals loaded in Inst Data");
                     return 0;
                 }
 
-                if(!InitializedItr)
+                if (!InitializedItr)
                 {
                     CrystalItr = FelCrystals.begin();
                     InitializedItr = true;
@@ -189,9 +189,9 @@ struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_magisters_terrace(Map* map)
+InstanceData* GetInstanceData_instance_magisters_terrace(Map* pMap)
 {
-    return new instance_magisters_terrace(map);
+    return new instance_magisters_terrace(pMap);
 }
 
 void AddSC_instance_magisters_terrace()
diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp
index 914a6b3d578..5f4b79453d3 100644
--- a/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp
+++ b/src/bindings/scripts/scripts/zone/maraudon/boss_celebras_the_cursed.cpp
@@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL celebras_the_cursedAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Wrath
@@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL celebras_the_cursedAI : public ScriptedAI
         {
             Unit* target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM,0);
-            if( target )
+            if (target)
                 DoCast(target,SPELL_WRATH);
             Wrath_Timer = 8000;
         }else Wrath_Timer -= diff;
diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp
index c67bebeebb0..4623a274767 100644
--- a/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp
+++ b/src/bindings/scripts/scripts/zone/maraudon/boss_landslide.cpp
@@ -48,7 +48,7 @@ struct TRINITY_DLL_DECL boss_landslideAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //KnockAway_Timer
@@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_landslideAI : public ScriptedAI
         }else Trample_Timer -= diff;
 
         //Landslide
-        if ( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 50 )
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 50)
         {
             if (Landslide_Timer < diff)
             {
diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp
index bd2b2096432..2064287b05e 100644
--- a/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp
+++ b/src/bindings/scripts/scripts/zone/maraudon/boss_noxxion.cpp
@@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL boss_noxxionAI : public ScriptedAI
         }
         Rand = 0;
         Summoned = DoSpawnCreature(13456, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000);
-        if(Summoned)
+        if (Summoned)
             (Summoned->AI())->AttackStart(victim);
     }
 
@@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL boss_noxxionAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //ToxicVolley_Timer
diff --git a/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp b/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp
index 0ecac0e86c4..8da0f24ba53 100644
--- a/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp
+++ b/src/bindings/scripts/scripts/zone/maraudon/boss_princess_theradras.cpp
@@ -56,7 +56,7 @@ struct TRINITY_DLL_DECL boss_ptheradrasAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Dustfield_Timer
@@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_ptheradrasAI : public ScriptedAI
         {
             Unit* target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM,0);
-            if( target )
+            if (target)
                 DoCast(target,SPELL_BOULDER);
             Boulder_Timer = 10000;
         }else Boulder_Timer -= diff;
diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp
index 450d136e0be..377ee2c6453 100644
--- a/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp
+++ b/src/bindings/scripts/scripts/zone/molten_core/boss_gehennas.cpp
@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_gehennasAI : public ScriptedAI
         //ShadowBolt_Timer
         if (ShadowBolt_Timer < diff)
         {
-            if( Unit* bTarget = SelectUnit(SELECT_TARGET_RANDOM,1) )
+            if (Unit* bTarget = SelectUnit(SELECT_TARGET_RANDOM,1))
                 DoCast(bTarget,SPELL_SHADOWBOLT);
             ShadowBolt_Timer = 7000;
         }else ShadowBolt_Timer -= diff;
@@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_gehennasAI : public ScriptedAI
         //RainOfFire_Timer
         if (RainOfFire_Timer < diff)
         {
-            if( Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_RAINOFFIRE);
 
             RainOfFire_Timer = 4000 + rand()%8000;
diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp
index 6d6ebb6507f..66b7f44f2e1 100644
--- a/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp
+++ b/src/bindings/scripts/scripts/zone/molten_core/boss_golemagg.cpp
@@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_GOLEMAGG_DEATH, 0);
     }
 
@@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI
         }else Pyroblast_Timer -= diff;
 
         //Enrage_Timer
-        if ( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 11 )
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 11)
         {
             if (Enrage_Timer < diff)
             {
@@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI
         }
 
         //EarthQuake_Timer
-        if ( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 11 )
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 11)
         {
             if (EarthQuake_Timer < diff)
             {
@@ -104,7 +104,7 @@ struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI
         }
 
         //Casting Buff for Coreragers. Spell is not working right. Players get the buff...
-        //        if(Buff_Timer < diff)
+        //        if (Buff_Timer < diff)
         //        {
         //            DoCast(m_creature, SPELL_BUFF);
         //            Buff_Timer = 2500;
@@ -148,19 +148,19 @@ struct TRINITY_DLL_DECL mob_core_ragerAI : public ScriptedAI
         }else Mangle_Timer -= diff;
 
         //Cast AEGIS
-        if ( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 50 )
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 50)
         {
             DoCast(m_creature,SPELL_AEGIS);
             DoScriptText(EMOTE_AEGIS, m_creature);
         }
 
         //Check_Timer
-        if(Check_Timer < diff)
+        if (Check_Timer < diff)
         {
-            if(pInstance)
+            if (pInstance)
             {
                 Unit *pGolemagg = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_GOLEMAGG));
-                if(!pGolemagg || !pGolemagg->isAlive())
+                if (!pGolemagg || !pGolemagg->isAlive())
                 {
                     m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, true);
                 }
diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp
index 0738457efae..08bc9916676 100644
--- a/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp
+++ b/src/bindings/scripts/scripts/zone/molten_core/boss_magmadar.cpp
@@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL boss_magmadarAI : public ScriptedAI
         //Lavabomb_Timer
         if (Lavabomb_Timer < diff)
         {
-            if( Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_LAVABOMB_ALT);
 
             Lavabomb_Timer = 12000;
diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp
index 7e956696aa8..aba509ff151 100644
--- a/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp
+++ b/src/bindings/scripts/scripts/zone/molten_core/boss_ragnaros.cpp
@@ -257,10 +257,10 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI
         }else Submerge_Timer -= diff;
 
         //If we are within range melee the target
-        if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
+        if (m_creature->IsWithinMeleeRange(m_creature->getVictim()))
         {
             //Make sure our attack is ready and we arn't currently casting
-            if( m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
+            if (m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
             {
                 m_creature->AttackerStateUpdate(m_creature->getVictim());
                 m_creature->resetAttackTimer();
diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp
index 89c0163700e..de32ba28c7f 100644
--- a/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp
+++ b/src/bindings/scripts/scripts/zone/molten_core/boss_shazzrah.cpp
@@ -95,7 +95,7 @@ struct TRINITY_DLL_DECL boss_shazzrahAI : public ScriptedAI
             Unit* target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM,0);
 
-            if(target)
+            if (target)
             {
             DoTeleportTo(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ());
             DoCast(target,SPELL_ARCANEEXPLOSION);
diff --git a/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp b/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp
index d5d614895dd..d86ed5165b5 100644
--- a/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp
+++ b/src/bindings/scripts/scripts/zone/molten_core/boss_sulfuron_harbinger.cpp
@@ -152,7 +152,7 @@ struct TRINITY_DLL_DECL mob_flamewaker_priestAI : public ScriptedAI
             return;
 
         //Casting Heal to Sulfuron or other Guards.
-        if(Heal_Timer < diff)
+        if (Heal_Timer < diff)
         {
             Unit* pUnit = DoSelectLowestHpFriendly(60.0f, 1);
             if (!pUnit)
diff --git a/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp b/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp
index 39aea9e8f72..18717652bdc 100644
--- a/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp
+++ b/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp
@@ -40,7 +40,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance
 {
-    instance_molten_core(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_molten_core(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint64 Lucifron, Magmadar, Gehennas, Garr, Geddon, Shazzrah, Sulfuron, Golemagg, Domo, Ragnaros, FlamewakerPriest;
     uint64 RuneKoro, RuneZeth, RuneMazj, RuneTheri, RuneBlaz, RuneKress, RuneMohn, m_uiFirelordCacheGUID;;
@@ -198,47 +198,47 @@ struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance
         switch(type)
         {
             case DATA_LUCIFRONISDEAD:
-                if(IsBossDied[0])
+                if (IsBossDied[0])
                     return 1;
                 break;
 
             case DATA_MAGMADARISDEAD:
-                if(IsBossDied[1])
+                if (IsBossDied[1])
                     return 1;
                 break;
 
             case DATA_GEHENNASISDEAD:
-                if(IsBossDied[2])
+                if (IsBossDied[2])
                     return 1;
                 break;
 
             case DATA_GARRISDEAD:
-                if(IsBossDied[3])
+                if (IsBossDied[3])
                     return 1;
                 break;
 
             case DATA_GEDDONISDEAD:
-                if(IsBossDied[4])
+                if (IsBossDied[4])
                     return 1;
                 break;
 
             case DATA_SHAZZRAHISDEAD:
-                if(IsBossDied[5])
+                if (IsBossDied[5])
                     return 1;
                 break;
 
             case DATA_SULFURONISDEAD:
-                if(IsBossDied[6])
+                if (IsBossDied[6])
                     return 1;
                 break;
 
             case DATA_GOLEMAGGISDEAD:
-                if(IsBossDied[7])
+                if (IsBossDied[7])
                     return 1;
                 break;
 
             case DATA_MAJORDOMOISDEAD:
-                if(IsBossDied[8])
+                if (IsBossDied[8])
                     return 1;
                 break;
         }
@@ -253,9 +253,9 @@ struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstance_instance_molten_core(Map *map)
+InstanceData* GetInstance_instance_molten_core(Map* pMap)
 {
-    return new instance_molten_core (map);
+    return new instance_molten_core (pMap);
 }
 
 void AddSC_instance_molten_core()
diff --git a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp
index 1b376fa7879..f4c9d4f6737 100644
--- a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp
+++ b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp
@@ -47,43 +47,43 @@ enum
 #define GOSSIP_ITEM_THUNDER     "I'd like to fly to Thunder Bluff."
 #define GOSSIP_ITEM_AQ_END      "Do you know where I can find Half Pendant of Aquatic Endurance?"
 
-bool GossipHello_npc_bunthen_plainswind(Player *player, Creature *_Creature)
+bool GossipHello_npc_bunthen_plainswind(Player* pPlayer, Creature *_Creature)
 {
-    if(player->getClass() != CLASS_DRUID)
-        player->SEND_GOSSIP_MENU(4916,_Creature->GetGUID());
-    else if(player->GetTeam() != HORDE)
+    if (pPlayer->getClass() != CLASS_DRUID)
+        pPlayer->SEND_GOSSIP_MENU(4916,_Creature->GetGUID());
+    else if (pPlayer->GetTeam() != HORDE)
     {
-        if(player->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+        if (pPlayer->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
 
-        player->SEND_GOSSIP_MENU(4917,_Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(4917,_Creature->GetGUID());
     }
-    else if(player->getClass() == CLASS_DRUID && player->GetTeam() == HORDE)
+    else if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == HORDE)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THUNDER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THUNDER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
 
-        if(player->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+        if (pPlayer->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
 
-        player->SEND_GOSSIP_MENU(4918,_Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(4918,_Creature->GetGUID());
     }
     return true;
 }
 
-bool GossipSelect_npc_bunthen_plainswind(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_bunthen_plainswind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch(action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:
-            player->CLOSE_GOSSIP_MENU();
-            if (player->getClass() == CLASS_DRUID && player->GetTeam() == HORDE)
-                player->ActivateTaxiPathTo(TAXI_PATH_ID_HORDE);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == HORDE)
+                pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID_HORDE);
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            player->SEND_GOSSIP_MENU(5373,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(5373,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
-            player->SEND_GOSSIP_MENU(5376,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(5376,_Creature->GetGUID());
             break;
     }
     return true;
@@ -98,42 +98,42 @@ bool GossipSelect_npc_bunthen_plainswind(Player *player, Creature *_Creature, ui
 #define GOSSIP_BEAR3 "I seek to understand the importance of strength of the heart."
 #define GOSSIP_BEAR4 "I have heard your words, Great Bear Spirit, and I understand. I now seek your blessings to fully learn the way of the Claw."
 
-bool GossipHello_npc_great_bear_spirit(Player *player, Creature *_Creature)
+bool GossipHello_npc_great_bear_spirit(Player* pPlayer, Creature *_Creature)
 {
     //ally or horde quest
-    if (player->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE)
+    if (pPlayer->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
-        player->SEND_GOSSIP_MENU(4719, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        pPlayer->SEND_GOSSIP_MENU(4719, _Creature->GetGUID());
     }
     else
-        player->SEND_GOSSIP_MENU(4718, _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(4718, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_great_bear_spirit(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_great_bear_spirit(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->SEND_GOSSIP_MENU(4721, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(4721, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(4733, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(4733, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(4734, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(4734, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
-            player->SEND_GOSSIP_MENU(4735, _Creature->GetGUID());
-            if (player->GetQuestStatus(5929)==QUEST_STATUS_INCOMPLETE)
-                player->AreaExploredOrEventHappens(5929);
-            if (player->GetQuestStatus(5930)==QUEST_STATUS_INCOMPLETE)
-                player->AreaExploredOrEventHappens(5930);
+            pPlayer->SEND_GOSSIP_MENU(4735, _Creature->GetGUID());
+            if (pPlayer->GetQuestStatus(5929)==QUEST_STATUS_INCOMPLETE)
+                pPlayer->AreaExploredOrEventHappens(5929);
+            if (pPlayer->GetQuestStatus(5930)==QUEST_STATUS_INCOMPLETE)
+                pPlayer->AreaExploredOrEventHappens(5930);
             break;
     }
     return true;
@@ -146,43 +146,43 @@ bool GossipSelect_npc_great_bear_spirit(Player *player, Creature *_Creature, uin
 #define GOSSIP_ITEM_RUTHERAN    "I'd like to fly to Rut'theran Village."
 #define GOSSIP_ITEM_AQ_AGI      "Do you know where I can find Half Pendant of Aquatic Agility?"
 
-bool GossipHello_npc_silva_filnaveth(Player *player, Creature *_Creature)
+bool GossipHello_npc_silva_filnaveth(Player* pPlayer, Creature *_Creature)
 {
-    if(player->getClass() != CLASS_DRUID)
-        player->SEND_GOSSIP_MENU(4913,_Creature->GetGUID());
-    else if(player->GetTeam() != ALLIANCE)
+    if (pPlayer->getClass() != CLASS_DRUID)
+        pPlayer->SEND_GOSSIP_MENU(4913,_Creature->GetGUID());
+    else if (pPlayer->GetTeam() != ALLIANCE)
     {
-        if(player->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+        if (pPlayer->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
 
-        player->SEND_GOSSIP_MENU(4915,_Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(4915,_Creature->GetGUID());
     }
-    else if(player->getClass() == CLASS_DRUID && player->GetTeam() == ALLIANCE)
+    else if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == ALLIANCE)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RUTHERAN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RUTHERAN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
 
-        if(player->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+        if (pPlayer->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
 
-        player->SEND_GOSSIP_MENU(4914,_Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(4914,_Creature->GetGUID());
     }
     return true;
 }
 
-bool GossipSelect_npc_silva_filnaveth(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_silva_filnaveth(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch(action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:
-            player->CLOSE_GOSSIP_MENU();
-            if (player->getClass() == CLASS_DRUID && player->GetTeam() == ALLIANCE)
-                player->ActivateTaxiPathTo(TAXI_PATH_ID_ALLY);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == ALLIANCE)
+                pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID_ALLY);
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            player->SEND_GOSSIP_MENU(5374,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(5374,_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
-            player->SEND_GOSSIP_MENU(5375,_Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(5375,_Creature->GetGUID());
             break;
     }
     return true;
@@ -272,7 +272,7 @@ public:
 
     void Reset()
     {
-        if(!PlayerGUID)
+        if (!PlayerGUID)
         {
             Step = 0;
             CurrWP = 0;
@@ -285,13 +285,13 @@ public:
 
     void JustDied(Unit *killer)
     {
-        if(!PlayerGUID)
+        if (!PlayerGUID)
             return;
 
-        Player *player = Unit::GetPlayer(PlayerGUID);
-        if(player && player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+        if (pPlayer && pPlayer->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
         {
-            player->FailQuest(10965);
+            pPlayer->FailQuest(10965);
             PlayerGUID = 0;
             Reset();
         }
@@ -299,10 +299,10 @@ public:
 
     void EnterEvadeMode()
     {
-        Player *player = Unit::GetPlayer(PlayerGUID);
-        if(player && player->isInCombat() && player->getAttackerForHelper())
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+        if (pPlayer && pPlayer->isInCombat() && pPlayer->getAttackerForHelper())
         {
-            AttackStart(player->getAttackerForHelper());
+            AttackStart(pPlayer->getAttackerForHelper());
             return;
         }
         npc_escortAI::EnterEvadeMode();
@@ -318,17 +318,17 @@ public:
         }
     }
 
-    void StartEvent(Player *player)
+    void StartEvent(Player* pPlayer)
     {
-        if(!player)
+        if (!pPlayer)
             return;
-        if(player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
+        if (pPlayer->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
         {
             for(uint8 i = 0; i < 41; ++i)
             {
                 AddWaypoint(i, Clintar_spirit_WP[i][0], Clintar_spirit_WP[i][1], Clintar_spirit_WP[i][2], (uint32)Clintar_spirit_WP[i][4]);
             }
-            PlayerGUID = player->GetGUID();
+            PlayerGUID = pPlayer->GetGUID();
             Start(true,false,PlayerGUID);
         }
         return;
@@ -338,28 +338,28 @@ public:
     {
         npc_escortAI::UpdateAI(diff);
 
-        if(!PlayerGUID)
+        if (!PlayerGUID)
         {
             m_creature->setDeathState(JUST_DIED);
             return;
         }
 
-        if(!m_creature->isInCombat() && !Event_onWait)
+        if (!m_creature->isInCombat() && !Event_onWait)
         {
-            if(checkPlayer_Timer < diff)
+            if (checkPlayer_Timer < diff)
             {
-                Player *player = Unit::GetPlayer(PlayerGUID);
-                if(player && player->isInCombat() && player->getAttackerForHelper())
-                    AttackStart(player->getAttackerForHelper());
+                Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+                if (pPlayer && pPlayer->isInCombat() && pPlayer->getAttackerForHelper())
+                    AttackStart(pPlayer->getAttackerForHelper());
                 checkPlayer_Timer = 1000;
             }else checkPlayer_Timer -= diff;
         }
 
-        if(Event_onWait && Event_Timer < diff)
+        if (Event_onWait && Event_Timer < diff)
         {
 
-            Player *player = Unit::GetPlayer(PlayerGUID);
-            if(!player || (player && player->GetQuestStatus(10965) == QUEST_STATUS_NONE))
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (!pPlayer || (pPlayer && pPlayer->GetQuestStatus(10965) == QUEST_STATUS_NONE))
             {
                 m_creature->setDeathState(JUST_DIED);
                 return;
@@ -390,7 +390,7 @@ public:
                             break;
                         case 1:
                             m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
-                            DoScriptText(CLINTAR_SPIRIT_SAY_GET_ONE, m_creature, player);
+                            DoScriptText(CLINTAR_SPIRIT_SAY_GET_ONE, m_creature, pPlayer);
                             Event_onWait = false;
                             break;
                     }
@@ -413,7 +413,7 @@ public:
                     switch(Step)
                     {
                         case 0:
-                            DoScriptText(CLINTAR_SPIRIT_SAY_GET_TWO, m_creature, player);
+                            DoScriptText(CLINTAR_SPIRIT_SAY_GET_TWO, m_creature, pPlayer);
                             Event_Timer = 15000;
                             Step = 1;
                             break;
@@ -428,7 +428,7 @@ public:
                         case 0:
                             {
                             Creature *mob = m_creature->SummonCreature(ASPECT_RAVEN, ASPECT_RAVEN_SUMMON_X, ASPECT_RAVEN_SUMMON_Y, ASPECT_RAVEN_SUMMON_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000);
-                            if(mob)
+                            if (mob)
                             {
                                 mob->AddThreat(m_creature,10000.0f);
                                 mob->AI()->AttackStart(m_creature);
@@ -460,7 +460,7 @@ public:
                     switch(Step)
                     {
                         case 0:
-                            DoScriptText(CLINTAR_SPIRIT_SAY_GET_THREE, m_creature, player);
+                            DoScriptText(CLINTAR_SPIRIT_SAY_GET_THREE, m_creature, pPlayer);
                             Event_Timer = 4000;
                             Step = 1;
                             break;
@@ -474,8 +474,8 @@ public:
                     {
                         case 0:
                             m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, 2);
-                            DoScriptText(CLINTAR_SPIRIT_SAY_GET_FINAL, m_creature, player);
-                            player->CompleteQuest(10965);
+                            DoScriptText(CLINTAR_SPIRIT_SAY_GET_FINAL, m_creature, pPlayer);
+                            pPlayer->CompleteQuest(10965);
                             Event_Timer = 1500;
                             Step = 1;
                             break;
@@ -485,7 +485,7 @@ public:
                             Step = 2;
                             break;
                         case 2:
-                            player->TalkedToCreature(m_creature->GetEntry(), m_creature->GetGUID());
+                            pPlayer->TalkedToCreature(m_creature->GetEntry(), m_creature->GetGUID());
                             PlayerGUID = 0;
                             Reset();
                             m_creature->setDeathState(JUST_DIED);
@@ -497,7 +497,7 @@ public:
                     break;
             }
 
-        } else if(Event_onWait) Event_Timer -= diff;
+        } else if (Event_onWait) Event_Timer -= diff;
     }
 
     void WaypointReached(uint32 id)
@@ -520,13 +520,13 @@ CreatureAI* GetAI_npc_clintar_spirit(Creature *_Creature)
 
 #define CLINTAR_SPIRIT 22916
 
-bool QuestAccept_npc_clintar_dreamwalker(Player *player, Creature *creature, Quest const *quest )
+bool QuestAccept_npc_clintar_dreamwalker(Player* pPlayer, Creature *creature, Quest const *quest)
 {
-    if(quest->GetQuestId() == 10965)
+    if (quest->GetQuestId() == 10965)
     {
         Creature *clintar_spirit = creature->SummonCreature(CLINTAR_SPIRIT, CLINTAR_SPIRIT_SUMMON_X, CLINTAR_SPIRIT_SUMMON_Y, CLINTAR_SPIRIT_SUMMON_Z, CLINTAR_SPIRIT_SUMMON_O, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 100000);
-        if(clintar_spirit)
-            CAST_AI(npc_clintar_spiritAI, clintar_spirit->AI())->StartEvent(player);
+        if (clintar_spirit)
+            CAST_AI(npc_clintar_spiritAI, clintar_spirit->AI())->StartEvent(pPlayer);
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp
index 0b84ba0a8b8..f9af9c786f8 100644
--- a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp
+++ b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp
@@ -36,23 +36,23 @@ EndContentData */
 
 #define GOSSIP_SW "Tell me a story, Skorn."
 
-bool GossipHello_npc_skorn_whitecloud(Player *player, Creature *_Creature)
+bool GossipHello_npc_skorn_whitecloud(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (!player->GetQuestRewardStatus(770))
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF );
+    if (!pPlayer->GetQuestRewardStatus(770))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(522,_Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(522,_Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_skorn_whitecloud(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_skorn_whitecloud(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF)
-        player->SEND_GOSSIP_MENU(523,_Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(523,_Creature->GetGUID());
 
     return true;
 }
@@ -258,7 +258,7 @@ struct TRINITY_DLL_DECL npc_plains_visionAI  : public ScriptedAI
 
     void MovementInform(uint32 type, uint32 id)
     {
-        if(type != POINT_MOTION_TYPE)
+        if (type != POINT_MOTION_TYPE)
             return;
 
         if (id < amountWP)
diff --git a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp
index a89c0c3325a..d0f760e467b 100644
--- a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp
+++ b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp
@@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL mob_shattered_rumblerAI : public ScriptedAI
 
     void SpellHit(Unit *Hitter, const SpellEntry *Spellkind)
     {
-        if(Spellkind->Id == 32001 && !Spawn)
+        if (Spellkind->Id == 32001 && !Spawn)
         {
             float x = m_creature->GetPositionX();
             float y = m_creature->GetPositionY();
@@ -193,35 +193,35 @@ CreatureAI* GetAI_mob_lump(Creature *_creature)
     return new mob_lumpAI(_creature);
 }
 
-bool GossipHello_mob_lump(Player *player, Creature *_Creature)
+bool GossipHello_mob_lump(Player* pPlayer, Creature *_Creature)
 {
-    if (player->GetQuestStatus(9918) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(9918) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(9352, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(9352, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_mob_lump(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_mob_lump(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->SEND_GOSSIP_MENU(9353, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(9353, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(9354, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(9354, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(9355, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(9355, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->SEND_GOSSIP_MENU(9356, _Creature->GetGUID());
-            player->TalkedToCreature(18354, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(9356, _Creature->GetGUID());
+            pPlayer->TalkedToCreature(18354, _Creature->GetGUID());
             break;
     }
     return true;
@@ -245,7 +245,7 @@ struct TRINITY_DLL_DECL mob_sunspring_villagerAI : public ScriptedAI
 
     void SpellHit(Unit *caster, const SpellEntry *spell)
     {
-        if(spell->Id == 32146)
+        if (spell->Id == 32146)
         {
             m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
             m_creature->RemoveCorpse();
@@ -272,79 +272,79 @@ CreatureAI* GetAI_mob_sunspring_villager(Creature *_Creature)
 #define GOSSIP_SATS5 "Ok."
 #define GOSSIP_SATS6 "[PH] Story done"
 
-bool GossipHello_npc_altruis_the_sufferer(Player *player, Creature *_Creature)
+bool GossipHello_npc_altruis_the_sufferer(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
     //gossip before obtaining Survey the Land
-    if ( player->GetQuestStatus(9991) == QUEST_STATUS_NONE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10);
+    if (pPlayer->GetQuestStatus(9991) == QUEST_STATUS_NONE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10);
 
     //gossip when Survey the Land is incomplete (technically, after the flight)
-    if (player->GetQuestStatus(9991) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20);
+    if (pPlayer->GetQuestStatus(9991) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20);
 
     //wowwiki.com/Varedis
-    if (player->GetQuestStatus(10646) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+30);
+    if (pPlayer->GetQuestStatus(10646) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+30);
 
-    player->SEND_GOSSIP_MENU(9419, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(9419, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_altruis_the_sufferer(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_altruis_the_sufferer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+10:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->SEND_GOSSIP_MENU(9420, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->SEND_GOSSIP_MENU(9420, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+11:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->SEND_GOSSIP_MENU(9421, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->SEND_GOSSIP_MENU(9421, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+12:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
-            player->SEND_GOSSIP_MENU(9422, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
+            pPlayer->SEND_GOSSIP_MENU(9422, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+13:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
-            player->SEND_GOSSIP_MENU(9423, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
+            pPlayer->SEND_GOSSIP_MENU(9423, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+14:
-            player->SEND_GOSSIP_MENU(9424, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(9424, _Creature->GetGUID());
             break;
 
         case GOSSIP_ACTION_INFO_DEF+20:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
-            player->SEND_GOSSIP_MENU(9427, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
+            pPlayer->SEND_GOSSIP_MENU(9427, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+21:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(9991);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(9991);
             break;
 
         case GOSSIP_ACTION_INFO_DEF+30:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 31);
-            player->SEND_GOSSIP_MENU(384, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 31);
+            pPlayer->SEND_GOSSIP_MENU(384, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+31:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(10646);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(10646);
             break;
     }
     return true;
 }
 
-bool QuestAccept_npc_altruis_the_sufferer(Player *player, Creature *creature, Quest const *quest )
+bool QuestAccept_npc_altruis_the_sufferer(Player* pPlayer, Creature *creature, Quest const *quest)
 {
-    if ( !player->GetQuestRewardStatus(9991) )              //Survey the Land, q-id 9991
+    if (!pPlayer->GetQuestRewardStatus(9991))              //Survey the Land, q-id 9991
     {
-        player->CLOSE_GOSSIP_MENU();
-        player->ActivateTaxiPathTo(532);                  //TaxiPath 532
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->ActivateTaxiPathTo(532);                  //TaxiPath 532
     }
     return true;
 }
@@ -369,84 +369,84 @@ bool QuestAccept_npc_altruis_the_sufferer(Player *player, Creature *creature, Qu
 #define GOSSIP_SGG11 "I will return to Azeroth at once, Greatmother."
 
 //all the textId's for the below is unknown, but i do believe the gossip item texts are proper.
-bool GossipHello_npc_greatmother_geyah(Player *player, Creature *_Creature)
+bool GossipHello_npc_greatmother_geyah(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(10044) == QUEST_STATUS_INCOMPLETE)
+    if (pPlayer->GetQuestStatus(10044) == QUEST_STATUS_INCOMPLETE)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-        player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
     }
-    else if (player->GetQuestStatus(10172) == QUEST_STATUS_INCOMPLETE)
+    else if (pPlayer->GetQuestStatus(10172) == QUEST_STATUS_INCOMPLETE)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
-        player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+        pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
     }
     else
 
-        player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_greatmother_geyah(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_greatmother_geyah(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:
-            player->AreaExploredOrEventHappens(10044);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(10044);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
 
         case GOSSIP_ACTION_INFO_DEF + 10:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
-            player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
+            pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 13:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
-            player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
+            pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 14:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15);
-            player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15);
+            pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 15:
-            player->AreaExploredOrEventHappens(10172);
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(10172);
+            pPlayer->CLOSE_GOSSIP_MENU();
             break;
     }
     return true;
@@ -465,57 +465,57 @@ bool GossipSelect_npc_greatmother_geyah(Player *player, Creature *_Creature, uin
 #define GOSSIP_SLB6 "We will fight you until the end, then, Lantresor. We will not stand idly by as you pillage our towns and kill our people."
 #define GOSSIP_SLB7 "What do I need to do?"
 
-bool GossipHello_npc_lantresor_of_the_blade(Player *player, Creature *_Creature)
+bool GossipHello_npc_lantresor_of_the_blade(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HLB, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HLB, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(9361, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(9361, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_lantresor_of_the_blade(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_lantresor_of_the_blade(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->SEND_GOSSIP_MENU(9362, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(9362, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(9363, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(9363, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(9364, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(9364, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->SEND_GOSSIP_MENU(9365, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(9365, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->SEND_GOSSIP_MENU(9366, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(9366, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->SEND_GOSSIP_MENU(9367, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->SEND_GOSSIP_MENU(9367, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+6:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
-            player->SEND_GOSSIP_MENU(9368, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            pPlayer->SEND_GOSSIP_MENU(9368, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+7:
-            player->SEND_GOSSIP_MENU(9369, _Creature->GetGUID());
-            if (player->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE)
-                player->AreaExploredOrEventHappens(10107);
-            if (player->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE)
-                player->AreaExploredOrEventHappens(10108);
+            pPlayer->SEND_GOSSIP_MENU(9369, _Creature->GetGUID());
+            if (pPlayer->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE)
+                pPlayer->AreaExploredOrEventHappens(10107);
+            if (pPlayer->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE)
+                pPlayer->AreaExploredOrEventHappens(10108);
             break;
     }
     return true;
@@ -535,18 +535,18 @@ struct TRINITY_DLL_DECL npc_creditmarker_visit_with_ancestorsAI : public Scripte
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(!who)
+        if (!who)
             return;
 
-        if(who->GetTypeId() == TYPEID_PLAYER)
+        if (who->GetTypeId() == TYPEID_PLAYER)
         {
-            if(CAST_PLR(who)->GetQuestStatus(10085) == QUEST_STATUS_INCOMPLETE)
+            if (CAST_PLR(who)->GetQuestStatus(10085) == QUEST_STATUS_INCOMPLETE)
             {
                 uint32 creditMarkerId = m_creature->GetEntry();
-                if((creditMarkerId >= 18840) && (creditMarkerId <= 18843))
+                if ((creditMarkerId >= 18840) && (creditMarkerId <= 18843))
                 {
                     // 18840: Sunspring, 18841: Laughing, 18842: Garadar, 18843: Bleeding
-                    if(!CAST_PLR(who)->GetReqKillOrCastCurrentCount(10085, creditMarkerId))
+                    if (!CAST_PLR(who)->GetReqKillOrCastCurrentCount(10085, creditMarkerId))
                         CAST_PLR(who)->KilledMonsterCredit(creditMarkerId, m_creature->GetGUID());
                 }
             }
@@ -584,7 +584,7 @@ struct TRINITY_DLL_DECL mob_sparrowhawkAI : public ScriptedAI
     }
     void AttackStart(Unit *who)
     {
-        if(PlayerGUID)
+        if (PlayerGUID)
             return;
 
         ScriptedAI::AttackStart(who);
@@ -594,10 +594,10 @@ struct TRINITY_DLL_DECL mob_sparrowhawkAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(!who || PlayerGUID)
+        if (!who || PlayerGUID)
             return;
 
-        if(!PlayerGUID && who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 30) && CAST_PLR(who)->GetQuestStatus(10987) == QUEST_STATUS_INCOMPLETE)
+        if (!PlayerGUID && who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 30) && CAST_PLR(who)->GetQuestStatus(10987) == QUEST_STATUS_INCOMPLETE)
         {
             PlayerGUID = who->GetGUID();
             return;
@@ -608,24 +608,24 @@ struct TRINITY_DLL_DECL mob_sparrowhawkAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(Check_Timer < diff)
+        if (Check_Timer < diff)
         {
-            if(PlayerGUID)
+            if (PlayerGUID)
             {
-                if(fleeing && m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != FLEEING_MOTION_TYPE)
+                if (fleeing && m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != FLEEING_MOTION_TYPE)
                     fleeing = false;
 
-                Player *player = Unit::GetPlayer(PlayerGUID);
-                if(player && m_creature->IsWithinDistInMap(player, 30))
+                Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+                if (pPlayer && m_creature->IsWithinDistInMap(pPlayer, 30))
                 {
-                    if(!fleeing)
+                    if (!fleeing)
                     {
                         m_creature->DeleteThreatList();
-                        m_creature->GetMotionMaster()->MoveFleeing(player);
+                        m_creature->GetMotionMaster()->MoveFleeing(pPlayer);
                         fleeing = true;
                     }
                 }
-                else if(fleeing)
+                else if (fleeing)
                 {
                     m_creature->GetMotionMaster()->MovementExpired(false);
                     PlayerGUID = 0;
@@ -645,7 +645,7 @@ struct TRINITY_DLL_DECL mob_sparrowhawkAI : public ScriptedAI
     {
         if (caster->GetTypeId() == TYPEID_PLAYER)
         {
-            if(spell->Id == SPELL_SPARROWHAWK_NET && CAST_PLR(caster)->GetQuestStatus(10987) == QUEST_STATUS_INCOMPLETE)
+            if (spell->Id == SPELL_SPARROWHAWK_NET && CAST_PLR(caster)->GetQuestStatus(10987) == QUEST_STATUS_INCOMPLETE)
             {
                 m_creature->CastSpell(caster, SPELL_ITEM_CAPTIVE_SPARROWHAWK, true);
                 m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp
index cd4dfee272f..3357d88b69e 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp
@@ -41,7 +41,7 @@ struct TRINITY_DLL_DECL boss_anubrekhanAI : public BossAI
     {
         HasTaunted = false;
         DoSpawnCreature(MOB_CRYPT_GUARD, 0, 10, 0, me->GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
-        if(HeroicMode)
+        if (HeroicMode)
             DoSpawnCreature(MOB_CRYPT_GUARD, 0, -10, 0, me->GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
     }
 
@@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_anubrekhanAI : public BossAI
         //Force the player to spawn corpse scarabs via spell
         victim->CastSpell(victim, SPELL_SELF_SPAWN_5, true, NULL, NULL, me->GetGUID());
 
-        if(!(rand()%5))
+        if (!(rand()%5))
             DoScriptText(SAY_SLAY, me);
     }
 
@@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL boss_anubrekhanAI : public BossAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(!HasTaunted && me->IsWithinDistInMap(who, 60.0f))
+        if (!HasTaunted && me->IsWithinDistInMap(who, 60.0f))
         {
             DoScriptText(SAY_GREET, me);
             HasTaunted = true;
@@ -77,7 +77,7 @@ struct TRINITY_DLL_DECL boss_anubrekhanAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() || !CheckInRoom())
+        if (!UpdateVictim() || !CheckInRoom())
             return;
 
         events.Update(diff);
@@ -89,8 +89,8 @@ struct TRINITY_DLL_DECL boss_anubrekhanAI : public BossAI
                 case EVENT_IMPALE:
                     //Cast Impale on a random target
                     //Do NOT cast it when we are afflicted by locust swarm
-                    if(!me->HasAura(SPELL_LOCUSTSWARM))
-                        if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                    if (!me->HasAura(SPELL_LOCUSTSWARM))
+                        if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                             DoCast(target, SPELL_IMPALE);
                     events.ScheduleEvent(EVENT_IMPALE, 15000, 1);
                     events.DelayEvents(1500, 1);
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp
index 9ee594b02b5..9f133df6c83 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp
@@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_faerlinaAI : public BossAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(!greet)
+        if (!greet)
         {
             DoScriptText(SAY_GREET, me);
             greet = true;
@@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL boss_faerlinaAI : public BossAI
 
     void KilledUnit(Unit* victim)
     {
-        if(!(rand()%3))
+        if (!(rand()%3))
             DoScriptText(SAY_SLAY, me);
     }
 
@@ -87,12 +87,12 @@ struct TRINITY_DLL_DECL boss_faerlinaAI : public BossAI
             switch(eventId)
             {
                 case EVENT_POSION:
-                    if(!me->HasAura(SPELL_WIDOWS_EMBRACE))
+                    if (!me->HasAura(SPELL_WIDOWS_EMBRACE))
                         DoCastAOE(SPELL_POSION_BOLT_VOLLEY);
                     events.ScheduleEvent(EVENT_POSION, 10000 + rand()%15000);
                     return;
                 case EVENT_FIRE:
-                    if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                    if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_RAIN_OF_FIRE);
                     events.ScheduleEvent(EVENT_FIRE, 5000 + rand()%15000);
                     return;
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp
index eeb691e09ec..30196384e59 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_four_horsemen.cpp
@@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_four_horsemenAI : public BossAI
     {
         id = Horsemen(0);
         for(uint8 i = 1; i < 4; ++i)
-            if(me->GetEntry() == MOB_HORSEMEN[i])
+            if (me->GetEntry() == MOB_HORSEMEN[i])
                 id = Horsemen(i);
         caster = (id == HORSEMEN_LADY || id == HORSEMEN_SIR);
     }
@@ -71,13 +71,13 @@ struct TRINITY_DLL_DECL boss_four_horsemenAI : public BossAI
     void MoveInLineOfSight(Unit *who)
     {
         BossAI::MoveInLineOfSight(who);
-        if(caster)
+        if (caster)
             SelectNearestTarget(who);
     }
 
     void AttackStart(Unit *who)
     {
-        if(caster)
+        if (caster)
             AttackStartCaster(who, 20);
         else
             BossAI::AttackStart(who);
@@ -85,9 +85,9 @@ struct TRINITY_DLL_DECL boss_four_horsemenAI : public BossAI
 
     void KilledUnit(Unit* victim)
     {
-        if(!(rand()%5))
+        if (!(rand()%5))
         {
-            if(id == HORSEMEN_BARON)
+            if (id == HORSEMEN_BARON)
                 DoScriptText(SAY_BARON_SLAY, me);
             else
                 DoScriptText(SAY_SLAY[id], me);
@@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL boss_four_horsemenAI : public BossAI
     void EnterCombat(Unit *who)
     {
         _EnterCombat();
-        if(id == HORSEMEN_BARON)
+        if (id == HORSEMEN_BARON)
             DoScriptText(SAY_BARON_AGGRO, me);
         else
             DoScriptText(SAY_AGGRO[id], me);
@@ -114,12 +114,12 @@ struct TRINITY_DLL_DECL boss_four_horsemenAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() || !CheckInRoom())
+        if (!UpdateVictim() || !CheckInRoom())
             return;
 
         events.Update(diff);
 
-        if(me->hasUnitState(UNIT_STAT_CASTING))
+        if (me->hasUnitState(UNIT_STAT_CASTING))
             return;
 
         while(uint32 eventId = events.ExecuteEvent())
@@ -127,13 +127,13 @@ struct TRINITY_DLL_DECL boss_four_horsemenAI : public BossAI
             switch(eventId)
             {
                 case EVENT_MARK:
-                    if(!(rand()%5))
+                    if (!(rand()%5))
                         DoScriptText(SAY_SPECIAL[id], me);
                     DoCastAOE(SPELL_MARK[id]);
                     events.ScheduleEvent(EVENT_MARK, 15000);
                     return;
                 case EVENT_CAST:
-                    if(!(rand()%5))
+                    if (!(rand()%5))
                         DoScriptText(SAY_TAUNT[rand()%3][id], me);
                     DoCast(SPELL_PRIMARY(id));
                     events.ScheduleEvent(EVENT_CAST, 15000);
@@ -145,9 +145,9 @@ struct TRINITY_DLL_DECL boss_four_horsemenAI : public BossAI
             }
         }
 
-        if(!caster)
+        if (!caster)
             DoMeleeAttackIfReady();
-        else if(!DoSpellAttackIfReady(SPELL_SECONDARY(id)))
+        else if (!DoSpellAttackIfReady(SPELL_SECONDARY(id)))
             DoCastAOE(SPELL_PUNISH[id]);
     }
 };
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp
index 3e44b1c1f6e..574dfab51c1 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_gluth.cpp
@@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL boss_gluthAI : public BossAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(who->GetEntry() == MOB_ZOMBIE && me->IsWithinDistInMap(who, 20))
+        if (who->GetEntry() == MOB_ZOMBIE && me->IsWithinDistInMap(who, 20))
         {
             SetGazeOn(who);
             me->MonsterTextEmote(" spots a nearby zombie to devour!", 0, true);
@@ -71,9 +71,9 @@ struct TRINITY_DLL_DECL boss_gluthAI : public BossAI
     void EnterCombat(Unit *who)
     {
         for(uint32 i = 0; i < 3; ++i)
-            if(Creature *trigger = DoSummon(WORLD_TRIGGER, PosSummon[i]))
+            if (Creature *trigger = DoSummon(WORLD_TRIGGER, PosSummon[i]))
                 triggers.push_back(trigger);
-        if(triggers.size() < 3)
+        if (triggers.size() < 3)
         {
             error_log("Script Gluth: cannot summon triggers!");
             EnterEvadeMode();
@@ -90,16 +90,16 @@ struct TRINITY_DLL_DECL boss_gluthAI : public BossAI
 
     void JustSummoned(Creature *summon)
     {
-        if(summon->GetEntry() == WORLD_TRIGGER)
+        if (summon->GetEntry() == WORLD_TRIGGER)
             summon->setActive(true);
-        else if(summon->GetEntry() == MOB_ZOMBIE)
+        else if (summon->GetEntry() == MOB_ZOMBIE)
             summon->AI()->AttackStart(me);
         summons.Summon(summon);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictimWithGaze() || !CheckInRoom())
+        if (!UpdateVictimWithGaze() || !CheckInRoom())
             return;
 
         events.Update(diff);
@@ -131,9 +131,9 @@ struct TRINITY_DLL_DECL boss_gluthAI : public BossAI
             }
         }
 
-        if(me->getVictim()->GetEntry() == MOB_ZOMBIE)
+        if (me->getVictim()->GetEntry() == MOB_ZOMBIE)
         {
-            if(me->IsWithinMeleeRange(me->getVictim()))
+            if (me->IsWithinMeleeRange(me->getVictim()))
             {
                 me->Kill(me->getVictim());
                 me->ModifyHealth(me->GetMaxHealth() * 0.05f);
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp
index 4e9706f913e..7b7b08c41c7 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp
@@ -121,13 +121,13 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
     void EnterCombat(Unit *who)
     {
         for(uint32 i = 0; i < POS_LIVE; ++i)
-            if(Creature *trigger = DoSummon(WORLD_TRIGGER, PosSummonLive[i]))
+            if (Creature *trigger = DoSummon(WORLD_TRIGGER, PosSummonLive[i]))
                 liveTrigger.push_back(trigger);
         for(uint32 i = 0; i < POS_DEAD; ++i)
-            if(Creature *trigger = DoSummon(WORLD_TRIGGER, PosSummonDead[i]))
+            if (Creature *trigger = DoSummon(WORLD_TRIGGER, PosSummonDead[i]))
                 deadTrigger.push_back(trigger);
 
-        if(liveTrigger.size() < POS_LIVE || deadTrigger.size() < POS_DEAD)
+        if (liveTrigger.size() < POS_LIVE || deadTrigger.size() < POS_DEAD)
         {
             error_log("Script Gothik: cannot summon triggers!");
             EnterEvadeMode();
@@ -140,13 +140,13 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
         events.ScheduleEvent(EVENT_SUMMON, 30000);
         DoTeleportTo(PosPlatform);
         DoScriptText(SAY_SPEECH, me);
-        if(instance)
+        if (instance)
             instance->SetData(DATA_GOTHIK_GATE, 1);
     }
 
     void JustSummoned(Creature *summon)
     {
-        if(summon->GetEntry() == WORLD_TRIGGER)
+        if (summon->GetEntry() == WORLD_TRIGGER)
             summon->setActive(true);
         else
         {
@@ -158,7 +158,7 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
 
     void KilledUnit(Unit* victim)
     {
-        if(!(rand()%5))
+        if (!(rand()%5))
             DoScriptText(SAY_KILL, me);
     }
 
@@ -177,7 +177,7 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
             case SPELL_INFORM_LIVE_KNIGHT:  spellId = SPELL_INFORM_DEAD_KNIGHT;     break;
             case SPELL_INFORM_LIVE_RIDER:   spellId = SPELL_INFORM_DEAD_RIDER;      break;
         }
-        if(spellId && me->isInCombat())
+        if (spellId && me->isInCombat())
         {
             me->HandleEmoteCommand(EMOTE_ONESHOT_SPELLCAST);
             me->CastSpell(deadTrigger[rand()%POS_DEAD], spellId, true);
@@ -186,7 +186,7 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
 
     void SpellHitTarget(Unit *target, const SpellEntry *spell)
     {
-        if(!me->isInCombat())
+        if (!me->isInCombat())
             return;
 
         switch(spell->Id)
@@ -200,12 +200,12 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateCombatState() || !CheckInRoom())
+        if (!UpdateCombatState() || !CheckInRoom())
             return;
 
         events.Update(diff);
 
-        if(me->hasUnitState(UNIT_STAT_CASTING))
+        if (me->hasUnitState(UNIT_STAT_CASTING))
             return;
 
         while(uint32 eventId = events.ExecuteEvent())
@@ -213,7 +213,7 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
             switch(eventId)
             {
                 case EVENT_SUMMON:
-                    if(waves[waveCount].entry)
+                    if (waves[waveCount].entry)
                     {
                         for(uint32 i = 0; i < waves[waveCount].number; ++i)
                             DoSummon(waves[waveCount].entry, liveTrigger[rand()%POS_LIVE], 1.0f);
@@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
                         DoTeleportTo(PosGround);
                         me->SetReactState(REACT_AGGRESSIVE);
                         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
-                        if(instance)
+                        if (instance)
                             instance->SetData(DATA_GOTHIK_GATE, 0);
                         summons.DoAction(0, 0);
                         summons.DoZoneInCombat();
@@ -268,37 +268,37 @@ struct TRINITY_DLL_DECL mob_gothik_minionAI : public SpellAI
 
     void DamageTaken(Unit *attacker, uint32 &damage)
     {
-        if(gateClose && !SIDE_CHECK(attacker))
+        if (gateClose && !SIDE_CHECK(attacker))
             damage = 0;
     }
 
     void JustDied(Unit *killer)
     {
-        if(me->isSummon())
+        if (me->isSummon())
         {
-            if(Unit *owner = CAST_SUM(me)->GetSummoner())
+            if (Unit *owner = CAST_SUM(me)->GetSummoner())
                 SpellAI::JustDied(owner);
         }
     }
 
     void EnterEvadeMode()
     {
-        if(!gateClose)
+        if (!gateClose)
         {
             SpellAI::EnterEvadeMode();
             return;
         }
 
-        if(!_EnterEvadeMode())
+        if (!_EnterEvadeMode())
             return;
 
-        Map *map = me->GetMap();
-        if(map->IsDungeon())
+        Map* pMap = me->GetMap();
+        if (pMap->IsDungeon())
         {
-            Map::PlayerList const &PlayerList = map->GetPlayers();
+            Map::PlayerList const &PlayerList = pMap->GetPlayers();
             for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
             {
-                if(i->getSource()->isAlive() && SIDE_CHECK(i->getSource()))
+                if (i->getSource()->isAlive() && SIDE_CHECK(i->getSource()))
                 {
                     AttackStart(i->getSource());
                     return;
@@ -312,7 +312,7 @@ struct TRINITY_DLL_DECL mob_gothik_minionAI : public SpellAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(gateClose && (!SIDE_CHECK(me) || me->getVictim() && !SIDE_CHECK(me->getVictim())))
+        if (gateClose && (!SIDE_CHECK(me) || me->getVictim() && !SIDE_CHECK(me->getVictim())))
         {
             EnterEvadeMode();
             return;
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp
index 45f54611ae3..ebb39bf54cc 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_grobbulus.cpp
@@ -46,16 +46,16 @@ struct TRINITY_DLL_DECL boss_grobbulusAI : public BossAI
 
     void SpellHitTarget(Unit *target, const SpellEntry *spell)
     {
-        if(spell->Id == SPELL_SLIME_SPRAY)
+        if (spell->Id == SPELL_SLIME_SPRAY)
         {
-            if(TempSummon *slime = me->SummonCreature(MOB_FALLOUT_SLIME, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0))
+            if (TempSummon *slime = me->SummonCreature(MOB_FALLOUT_SLIME, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0))
                 DoZoneInCombat(slime);
         }
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         events.Update(diff);
@@ -76,8 +76,8 @@ struct TRINITY_DLL_DECL boss_grobbulusAI : public BossAI
                     events.ScheduleEvent(EVENT_SPRAY, 15000+rand()%15000);
                     return;
                 case EVENT_INJECT:
-                    if(Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
-                        if(!target->HasAura(SPELL_MUTATING_INJECTION))
+                    if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                        if (!target->HasAura(SPELL_MUTATING_INJECTION))
                             DoCast(target, SPELL_MUTATING_INJECTION);
                     events.ScheduleEvent(EVENT_INJECT, 8000 + 12000 * ((float)me->GetHealth() / me->GetMaxHealth()));
                     return;
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp
index 38071251b78..b653ee802c8 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_heigan.cpp
@@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_heiganAI : public BossAI
 
     void KilledUnit(Unit* Victim)
     {
-        if(!(rand()%5))
+        if (!(rand()%5))
             DoScriptText(SAY_SLAY, me);
     }
 
@@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL boss_heiganAI : public BossAI
         phase = newPhase;
         events.Reset();
         eruptSection = 3;
-        if(phase == PHASE_FIGHT)
+        if (phase == PHASE_FIGHT)
         {
             events.ScheduleEvent(EVENT_DISRUPT, 0);
             events.ScheduleEvent(EVENT_FEVER, 20000);
@@ -95,7 +95,7 @@ struct TRINITY_DLL_DECL boss_heiganAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() || !CheckInRoom())
+        if (!UpdateVictim() || !CheckInRoom())
             return;
 
         events.Update(diff);
@@ -119,9 +119,9 @@ struct TRINITY_DLL_DECL boss_heiganAI : public BossAI
                     instance->SetData(DATA_HEIGAN_ERUPT, eruptSection);
                     TeleportCheaters();
 
-                    if(eruptSection == 0)
+                    if (eruptSection == 0)
                         eruptDirection = true;
-                    else if(eruptSection == 3)
+                    else if (eruptSection == 3)
                         eruptDirection = false;
 
                     eruptDirection ? ++eruptSection : --eruptSection;
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp
index 44e8455d41a..e949fc78b18 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_highlord_mograine.cpp
@@ -74,7 +74,7 @@ struct TRINITY_DLL_DECL boss_highlord_mograineAI : public ScriptedAI
 
     void InitialYell()
     {
-        if(!m_creature->isInCombat())
+        if (!m_creature->isInCombat())
         {
             switch(rand()%3)
             {
@@ -126,24 +126,24 @@ struct TRINITY_DLL_DECL boss_highlord_mograineAI : public ScriptedAI
             return;
 
         // Mark of Mograine
-        if(Mark_Timer < diff)
+        if (Mark_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_MARK_OF_MOGRAINE);
             Mark_Timer = 12000;
         }else Mark_Timer -= diff;
 
         // Shield Wall - All 4 horsemen will shield wall at 50% hp and 20% hp for 20 seconds
-        if(ShieldWall1 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50)
+        if (ShieldWall1 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50)
         {
-            if(ShieldWall1)
+            if (ShieldWall1)
             {
                 DoCast(m_creature,SPELL_SHIELDWALL);
                 ShieldWall1 = false;
             }
         }
-        if(ShieldWall2 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 20)
+        if (ShieldWall2 && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 20)
         {
-            if(ShieldWall2)
+            if (ShieldWall2)
             {
                 DoCast(m_creature,SPELL_SHIELDWALL);
                 ShieldWall2 = false;
@@ -151,9 +151,9 @@ struct TRINITY_DLL_DECL boss_highlord_mograineAI : public ScriptedAI
         }
 
         // Righteous Fire
-        if(RighteousFire_Timer < diff)
+        if (RighteousFire_Timer < diff)
         {
-            if(rand()%4 == 1)                               // 1/4
+            if (rand()%4 == 1)                               // 1/4
             {
                 DoCast(m_creature->getVictim(),SPELL_RIGHTEOUS_FIRE);
             }
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp
index 8cd606f42c4..b5f40695f0b 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp
@@ -145,12 +145,12 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateCombatState())
+        if (!UpdateCombatState())
             return;
 
         events.Update(diff);
 
-        if(Phase == 1)
+        if (Phase == 1)
         {
             while(uint32 eventId = events.GetEvent())
             {
@@ -175,7 +175,7 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI
                         events.ScheduleEvent(EVENT_DETONATE, 20000);
                         events.ScheduleEvent(EVENT_FISSURE, 25000);
                         events.ScheduleEvent(EVENT_BLAST, (rand()%30+30)*1000);
-                        if(HeroicMode)
+                        if (HeroicMode)
                             events.ScheduleEvent(EVENT_CHAIN, (rand()%30+30)*1000);
                         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                         me->SetReactState(REACT_AGGRESSIVE);
@@ -190,9 +190,9 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI
         else
         {
             //start phase 3 when we are 40% health
-            if(Phase != 3)
+            if (Phase != 3)
             {
-                if(HealthBelowPct(40))
+                if (HealthBelowPct(40))
                 {
                     Phase = 3 ;
                     DoScriptText(SAY_REQUEST_AID, m_creature);
@@ -201,9 +201,9 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI
                     DoScriptText(SAY_ANSWER_REQUEST, m_creature);
                 }
             }
-            else if(GuardiansOfIcecrown_Count < HEROIC(2,5))
+            else if (GuardiansOfIcecrown_Count < HEROIC(2,5))
             {
-                if(GuardiansOfIcecrown_Timer < diff)
+                if (GuardiansOfIcecrown_Timer < diff)
                 {
                     DoSummon(MOB_ICECROWN, Pos[RAND(2,5,8)]);
                     ++GuardiansOfIcecrown_Count;
@@ -212,10 +212,10 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI
                 else GuardiansOfIcecrown_Timer -= diff;
             }
 
-            if(me->hasUnitState(UNIT_STAT_CASTING))
+            if (me->hasUnitState(UNIT_STAT_CASTING))
                 return;
 
-            if(uint32 eventId = events.GetEvent())
+            if (uint32 eventId = events.GetEvent())
             {
                 switch(eventId)
                 {
@@ -228,7 +228,7 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI
                         events.RepeatEvent(15000);
                         return;
                     case EVENT_CHAIN:
-                        if(Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true))
+                        if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true))
                             DoCast(target, SPELL_CHAINS_OF_KELTHUZAD);
                         DoScriptText(SAY_CHAIN, me);
                         events.RepeatEvent((rand()%30+30)*1000);
@@ -239,13 +239,13 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI
                         std::list<HostilReference*> *threatList = &me->getThreatManager().getThreatList();
                         for(std::list<HostilReference*>::const_iterator itr = threatList->begin(); itr != threatList->end(); ++itr)
                         {
-                            if((*itr)->getTarget()->GetTypeId() == TYPEID_PLAYER
+                            if ((*itr)->getTarget()->GetTypeId() == TYPEID_PLAYER
                                 && (*itr)->getTarget()->getPowerType() == POWER_MANA
                                 && (*itr)->getTarget()->GetPower(POWER_MANA))
                                 unitList.push_back((*itr)->getTarget());
                         }
 
-                        if(!unitList.empty())
+                        if (!unitList.empty())
                         {
                             std::vector<Unit*>::iterator itr = unitList.begin();
                             advance(itr, rand()%unitList.size());
@@ -257,14 +257,14 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI
                         return;                        
                     }
                     case EVENT_FISSURE:
-                        if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
+                        if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
                             DoCast(target, SPELL_SHADOW_FISURE);
                         events.RepeatEvent(25000);
                         return;
                     case EVENT_BLAST:
-                        if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true))
+                        if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true))
                             DoCast(target, SPELL_FROST_BLAST);
-                        if(rand()%2)
+                        if (rand()%2)
                             DoScriptText(SAY_FROST_BLAST, m_creature);
                         events.RepeatEvent((rand()%30+30)*1000);
                         return;
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp
index 8548862d1b5..83cc43b1ce0 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_loatheb.cpp
@@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_loathebAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         events.Update(diff);
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp
index ff23e77a673..dddea4ea5c0 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_maexxna.cpp
@@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL boss_maexxnaAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() || !CheckInRoom())
+        if (!UpdateVictim() || !CheckInRoom())
             return;
 
         events.Update(diff);
@@ -76,12 +76,12 @@ struct TRINITY_DLL_DECL boss_maexxnaAI : public BossAI
                 case EVENT_WRAP:
                     for(uint32 i = 0; i < HEROIC(1,2); ++i)
                     {
-                        if(Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP))
+                        if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP))
                         {
                             target->RemoveAura(SPELL_WEB_SPRAY);
                             uint32 pos = rand()%MAX_POS_WRAP;
                             target->GetMotionMaster()->MoveJump(PosWrap[pos][0], PosWrap[pos][1], PosWrap[pos][2], 20, 20);
-                            if(Creature *wrap = DoSummon(MOB_WEB_WRAP, target, 0, 60000))
+                            if (Creature *wrap = DoSummon(MOB_WEB_WRAP, target, 0, 60000))
                             {
                                 wrap->AI()->SetGUID(target->GetGUID());
                                 wrap->GetMotionMaster()->MoveJump(PosWrap[pos][0], PosWrap[pos][1], PosWrap[pos][2], 20, 20);
@@ -113,7 +113,7 @@ struct TRINITY_DLL_DECL boss_maexxnaAI : public BossAI
             }
         }                    
 
-        if(!enraged && HealthBelowPct(30))
+        if (!enraged && HealthBelowPct(30))
         {
             DoCast(me, SPELL_FRENZY);
             enraged = true;
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp
index ef0142cfd42..802082029eb 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp
@@ -87,21 +87,21 @@ struct TRINITY_DLL_DECL boss_nothAI : public BossAI
         me->SetReactState(REACT_AGGRESSIVE);
         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
         DoZoneInCombat();
-        if(me->getThreatManager().isThreatListEmpty())
+        if (me->getThreatManager().isThreatListEmpty())
             EnterEvadeMode();
         else
         {
             events.ScheduleEvent(EVENT_BALCONY, 110000);
             events.ScheduleEvent(EVENT_CURSE, 20000+rand()%10000);
             events.ScheduleEvent(EVENT_WARRIOR, 30000);
-            if(HeroicMode)
+            if (HeroicMode)
                 events.ScheduleEvent(EVENT_BLINK, 20000+rand()%10000);
         }
     }
 
     void KilledUnit(Unit* victim)
     {
-        if(!(rand()%5))
+        if (!(rand()%5))
             DoScriptText(SAY_SLAY, me);
     }
 
@@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL boss_nothAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateCombatState() || !CheckInRoom())
+        if (!UpdateCombatState() || !CheckInRoom())
             return;
 
         events.Update(diff);
@@ -190,7 +190,7 @@ struct TRINITY_DLL_DECL boss_nothAI : public BossAI
             }
         }
 
-        if(me->HasReactState(REACT_AGGRESSIVE))
+        if (me->HasReactState(REACT_AGGRESSIVE))
             DoMeleeAttackIfReady();
     }
 };
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp
index 7886fad94cc..0ea88d8a977 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_patchwerk.cpp
@@ -41,7 +41,7 @@ struct TRINITY_DLL_DECL boss_patchwerkAI : public BossAI
 
     void KilledUnit(Unit* Victim)
     {
-        if(!(rand()%5))
+        if (!(rand()%5))
             DoScriptText(SAY_SLAY, me);
     }
 
@@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL boss_patchwerkAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         events.Update(diff);
@@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL boss_patchwerkAI : public BossAI
             }
         }
 
-        if(!Enraged && HealthBelowPct(5))
+        if (!Enraged && HealthBelowPct(5))
         {
             DoCast(m_creature, SPELL_FRENZY);
             DoScriptText(EMOTE_ENRAGE, NULL);
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp
index 67fcaee7de3..2d96f7bdb82 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_razuvious.cpp
@@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_razuviousAI : public BossAI
 
     void KilledUnit(Unit* victim)
     {
-        if(!(rand()%3))
+        if (!(rand()%3))
             DoPlaySoundToSet(me, SOUND_SLAY);
     }
 
@@ -80,7 +80,7 @@ struct TRINITY_DLL_DECL boss_razuviousAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         events.Update(diff);
@@ -98,7 +98,7 @@ struct TRINITY_DLL_DECL boss_razuviousAI : public BossAI
                     events.ScheduleEvent(EVENT_SHOUT, 25000);
                     return;
                 case EVENT_KNIFE:
-                    if(Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45))
+                    if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45))
                         DoCast(target, SPELL_JAGGED_KNIFE);
                     events.ScheduleEvent(EVENT_KNIFE, 25000);
                     return;
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp
index 47b991e8346..0607a2604d9 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp
@@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
     {
         _Reset();
 
-        if(phase = PHASE_FLIGHT)
+        if (phase = PHASE_FLIGHT)
             ClearIceBlock();
 
         phase = PHASE_NULL;
@@ -110,12 +110,12 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
 
     void SpellHitTarget(Unit *target, const SpellEntry *spell)
     {
-        if(spell->Id == SPELL_ICEBOLT)
+        if (spell->Id == SPELL_ICEBOLT)
         {
             IceBlockMap::iterator itr = iceblocks.find(target->GetGUID());
-            if(itr != iceblocks.end() && !itr->second)
+            if (itr != iceblocks.end() && !itr->second)
             {
-                if(GameObject *iceblock = me->SummonGameObject(GO_ICEBLOCK, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, 0, 0, 0, 0, 25000))
+                if (GameObject *iceblock = me->SummonGameObject(GO_ICEBLOCK, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, 0, 0, 0, 0, 25000))
                     itr->second = iceblock->GetGUID();
             }
         }
@@ -129,13 +129,13 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
 
     void MovementInform(uint32, uint32 id)
     {
-        if(id == 1)
+        if (id == 1)
             events.ScheduleEvent(EVENT_LIFTOFF, 0);
     }
 
     void DoAction(const int32 param)
     {
-        if(param == DATA_SAPPHIRON_BIRTH)
+        if (param == DATA_SAPPHIRON_BIRTH)
         {
             phase = PHASE_BIRTH;
             events.ScheduleEvent(EVENT_BIRTH, 23000);
@@ -158,9 +158,9 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
     {
         for(IceBlockMap::iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr)
         {
-            if(Player *player = Unit::GetPlayer(itr->first))
-                player->RemoveAura(SPELL_ICEBOLT);
-            if(GameObject *go = GameObject::GetGameObject(*me, itr->second))
+            if (Player* pPlayer = Unit::GetPlayer(itr->first))
+                pPlayer->RemoveAura(SPELL_ICEBOLT);
+            if (GameObject *go = GameObject::GetGameObject(*me, itr->second))
                 go->DeleteObjectWithOwner();
         }
         iceblocks.clear();
@@ -168,15 +168,15 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!phase)
+        if (!phase)
             return;
 
         events.Update(diff);
 
-        if(phase != PHASE_BIRTH && !UpdateCombatState() || !CheckInRoom())
+        if (phase != PHASE_BIRTH && !UpdateCombatState() || !CheckInRoom())
             return;
 
-        if(phase == PHASE_GROUND)
+        if (phase == PHASE_GROUND)
         {
             while(uint32 eventId = events.ExecuteEvent())
             {
@@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
                         //DoCastAOE(SPELL_SUMMON_BLIZZARD);
                         float x, y, z;
                         me->GetGroundPointAroundUnit(x, y, z, rand_norm()*20, rand_norm()*2*M_PI);
-                        if(Creature *summon = me->SummonCreature(MOB_BLIZZARD, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 25000+rand()%5000))
+                        if (Creature *summon = me->SummonCreature(MOB_BLIZZARD, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 25000+rand()%5000))
                             summon->GetMotionMaster()->MoveRandom(40);
                         events.ScheduleEvent(EVENT_BLIZZARD, HEROIC(20000,7000), 0, PHASE_GROUND);
                         break;
@@ -224,7 +224,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
         }
         else
         {
-            if(uint32 eventId = events.ExecuteEvent())
+            if (uint32 eventId = events.ExecuteEvent())
             {
                 switch(eventId)
                 {
@@ -240,10 +240,10 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
                         std::vector<Unit*> targets;
                         std::list<HostilReference*>::iterator i = me->getThreatManager().getThreatList().begin();
                         for(; i != me->getThreatManager().getThreatList().end(); ++i)
-                            if((*i)->getTarget()->GetTypeId() == TYPEID_PLAYER && !(*i)->getTarget()->HasAura(SPELL_ICEBOLT))
+                            if ((*i)->getTarget()->GetTypeId() == TYPEID_PLAYER && !(*i)->getTarget()->HasAura(SPELL_ICEBOLT))
                                 targets.push_back((*i)->getTarget());
 
-                        if(targets.empty())
+                        if (targets.empty())
                             iceboltCount = 0;
                         else
                         {
@@ -254,7 +254,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
                             --iceboltCount;
                         }
 
-                        if(iceboltCount)
+                        if (iceboltCount)
                             events.ScheduleEvent(EVENT_ICEBOLT, 1000);
                         else
                             events.ScheduleEvent(EVENT_BREATH, 1000);
@@ -287,8 +287,8 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
                         me->SetReactState(REACT_AGGRESSIVE);
                         return;
                 }
-            }//if(uint32 eventId = events.ExecuteEvent())
-        }//if(phase == PHASE_GROUND)
+            }//if (uint32 eventId = events.ExecuteEvent())
+        }//if (phase == PHASE_GROUND)
     }
 
     void CastExplosion()
@@ -299,10 +299,10 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
         for(; i != me->getThreatManager().getThreatList().end(); ++i)
         {
             Unit *target = (*i)->getTarget();
-            if(target->GetTypeId() != TYPEID_PLAYER)
+            if (target->GetTypeId() != TYPEID_PLAYER)
                 continue;
 
-            if(target->HasAura(SPELL_ICEBOLT))
+            if (target->HasAura(SPELL_ICEBOLT))
             {
                 target->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true);
                 targets.push_back(target);
@@ -311,9 +311,9 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
 
             for(IceBlockMap::iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr)
             {
-                if(GameObject *go = GameObject::GetGameObject(*me, itr->second))
+                if (GameObject *go = GameObject::GetGameObject(*me, itr->second))
                 {
-                    if(go->IsInBetween(me, target, 2.0f)
+                    if (go->IsInBetween(me, target, 2.0f)
                         && me->GetExactDistance2d(target->GetPositionX(), target->GetPositionY()) - me->GetExactDistance2d(go->GetPositionX(), go->GetPositionY()) < 5.0f)
                     {
                         target->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true);
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp
index 941fe420ed3..82193f381d0 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_thaddius.cpp
@@ -74,7 +74,7 @@ struct TRINITY_DLL_DECL boss_thaddiusAI : public BossAI
 
     void KilledUnit(Unit* victim)
     {
-        if(!(rand()%5))
+        if (!(rand()%5))
             DoScriptText(SAY_SLAY, me);
     }
 
@@ -95,12 +95,12 @@ struct TRINITY_DLL_DECL boss_thaddiusAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         events.Update(diff);
 
-        if(me->hasUnitState(UNIT_STAT_CASTING))
+        if (me->hasUnitState(UNIT_STAT_CASTING))
             return;
 
         while(uint32 eventId = events.ExecuteEvent())
@@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL boss_thaddiusAI : public BossAI
             }
         }
 
-        if(events.GetTimer() > 15000 && !me->IsWithinMeleeRange(me->getVictim()))
+        if (events.GetTimer() > 15000 && !me->IsWithinMeleeRange(me->getVictim()))
             DoCast(me->getVictim(), SPELL_BALL_LIGHTNING);
         else
             DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp b/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp
index b00a64af78e..53f02af4d65 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp
@@ -81,23 +81,23 @@ const float HeiganEruptionSlope[3] =
 inline uint32 GetEruptionSection(float x, float y)
 {
     y -= HeiganPos[1];
-    if(y < 1.0f)
+    if (y < 1.0f)
         return 0;
 
     x -= HeiganPos[0];
-    if(x > -1.0f)
+    if (x > -1.0f)
         return 3;
 
     float slope = y/x;
     for(uint32 i = 0; i < 3; ++i)
-        if(slope > HeiganEruptionSlope[i])
+        if (slope > HeiganEruptionSlope[i])
             return i;
     return 3;
 }
 
 struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData
 {
-    instance_naxxramas(Map *map) : InstanceData(map)
+    instance_naxxramas(Map* pMap) : InstanceData(pMap)
         , Sapphiron(NULL), GothikGate(NULL), HorsemenChest(NULL), HorsemenNum(0)
     {
         SetBossNumber(MAX_BOSS_NUMBER);
@@ -122,10 +122,10 @@ struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData
 
     void OnGameObjectCreate(GameObject* go, bool add)
     {
-        if(go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287)
+        if (go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287)
         {
             uint32 section = GetEruptionSection(go->GetPositionX(), go->GetPositionY());
-            if(add)
+            if (add)
                 HeiganEruption[section].insert(go);
             else
                 HeiganEruption[section].erase(go);
@@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData
 
         switch(go->GetEntry())
         {
-            case GO_BIRTH: if(!add && Sapphiron) Sapphiron->AI()->DoAction(DATA_SAPPHIRON_BIRTH); return;
+            case GO_BIRTH: if (!add && Sapphiron) Sapphiron->AI()->DoAction(DATA_SAPPHIRON_BIRTH); return;
             case GO_GOTHIK_GATE: GothikGate = add ? go : NULL; break;
             case GO_HORSEMEN_CHEST: HorsemenChest = add ? go : NULL; break;
         }
@@ -150,7 +150,7 @@ struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData
                 HeiganErupt(value);
                 break;
             case DATA_GOTHIK_GATE:
-                if(GothikGate)
+                if (GothikGate)
                     GothikGate->SetGoState(GOState(value));
                 break;
         }
@@ -158,10 +158,10 @@ struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData
 
     bool SetBossState(uint32 id, EncounterState state)
     {
-        if(!InstanceData::SetBossState(id, state))
+        if (!InstanceData::SetBossState(id, state))
             return false;
         
-        if(id == BOSS_HORSEMEN && state == DONE && HorsemenChest)
+        if (id == BOSS_HORSEMEN && state == DONE && HorsemenChest)
             HorsemenChest->SetRespawnTime(HorsemenChest->GetRespawnDelay());
 
         return true;
@@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData
     {
         for(uint32 i = 0; i < 4; ++i)
         {
-            if(i == section)
+            if (i == section)
                 continue;
 
             for(std::set<GameObject*>::iterator itr = HeiganEruption[i].begin(); itr != HeiganEruption[i].end(); ++itr)
@@ -183,23 +183,23 @@ struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData
     }
 };
 
-bool AreaTrigger_at_naxxramas_frostwyrm_wing(Player *player, AreaTriggerEntry *at)
+bool AreaTrigger_at_naxxramas_frostwyrm_wing(Player* pPlayer, AreaTriggerEntry *at)
 {
-    if(player->isGameMaster())
+    if (pPlayer->isGameMaster())
         return false;
 
-    InstanceData *data = player->GetInstanceData();
-    if(data)
+    InstanceData *data = pPlayer->GetInstanceData();
+    if (data)
         for(uint32 i = BOSS_ANUBREKHAN; i < BOSS_SAPPHIRON; ++i)
-            if(data->GetBossState(i) != DONE)
+            if (data->GetBossState(i) != DONE)
                 return true;
 
     return false;
 }
 
-InstanceData* GetInstanceData_instance_naxxramas(Map* map)
+InstanceData* GetInstanceData_instance_naxxramas(Map* pMap)
 {
-    return new instance_naxxramas(map);
+    return new instance_naxxramas(pMap);
 }
 
 void AddSC_instance_naxxramas()
diff --git a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp
index 1cbc5b37765..35e08031d3f 100644
--- a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp
+++ b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp
@@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI
     {
         //we have no way of telling the creature was hit by spell -> got aura applied after 10-12 seconds
         //then no way for the mobs to actually stop the shutdown as intended.
-        if( spell->Id == SPELL_INTERRUPT_1 )
+        if (spell->Id == SPELL_INTERRUPT_1)
             DoSay("Silence! I kill you!",LANG_UNIVERSAL, NULL);
     }*/
 
@@ -95,12 +95,12 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI
     {
         DoScriptText(EMOTE_ABORT, m_creature);
 
-        if( someplayer )
+        if (someplayer)
         {
             Unit* p = Unit::GetUnit((*m_creature),someplayer);
-            if( p && p->GetTypeId() == TYPEID_PLAYER )
+            if (p && p->GetTypeId() == TYPEID_PLAYER)
             {
-                switch( m_creature->GetEntry() )
+                switch(m_creature->GetEntry())
                 {
                     case ENTRY_BNAAR_C_CONSOLE:
                         CAST_PLR(p)->FailQuest(10299);
@@ -122,62 +122,62 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI
             }
         }
 
-        if( goConsole )
+        if (goConsole)
         {
-            if( GameObject* go = GameObject::GetGameObject((*m_creature),goConsole) )
+            if (GameObject* go = GameObject::GetGameObject((*m_creature),goConsole))
                 go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
         }
     }
 
     void DoWaveSpawnForCreature(Creature *creature)
     {
-        switch( creature->GetEntry() )
+        switch(creature->GetEntry())
         {
             case ENTRY_BNAAR_C_CONSOLE:
-                if( rand()%2 )
+                if (rand()%2)
                 {
                     add = m_creature->SummonCreature(ENTRY_SUNFURY_TECH,2933.68,4162.55,164.00,1.60,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if( add ) add->GetMotionMaster()->MovePoint(0,2927.36,4212.97,164.00);
+                    if (add) add->GetMotionMaster()->MovePoint(0,2927.36,4212.97,164.00);
                 }
                 else
                 {
                     add = m_creature->SummonCreature(ENTRY_SUNFURY_TECH,2927.36,4212.97,164.00,4.94,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if( add ) add->GetMotionMaster()->MovePoint(0,2933.68,4162.55,164.00);
+                    if (add) add->GetMotionMaster()->MovePoint(0,2933.68,4162.55,164.00);
                 }
                 Wave_Timer = 30000;
                 break;
             case ENTRY_CORUU_C_CONSOLE:
                 add = m_creature->SummonCreature(ENTRY_SUNFURY_TECH,2445.21,2765.26,134.49,3.93,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                if( add ) add->GetMotionMaster()->MovePoint(0,2424.21,2740.15,133.81);
+                if (add) add->GetMotionMaster()->MovePoint(0,2424.21,2740.15,133.81);
                 add = m_creature->SummonCreature(ENTRY_SUNFURY_TECH,2429.86,2731.85,134.53,1.31,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                if( add ) add->GetMotionMaster()->MovePoint(0,2435.37,2766.04,133.81);
+                if (add) add->GetMotionMaster()->MovePoint(0,2435.37,2766.04,133.81);
                 Wave_Timer = 20000;
                 break;
             case ENTRY_DURO_C_CONSOLE:
                 add = m_creature->SummonCreature(ENTRY_SUNFURY_TECH,2986.80,2205.36,165.37,3.74,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                if( add ) add->GetMotionMaster()->MovePoint(0,2985.15,2197.32,164.79);
+                if (add) add->GetMotionMaster()->MovePoint(0,2985.15,2197.32,164.79);
                 add = m_creature->SummonCreature(ENTRY_SUNFURY_TECH,2952.91,2191.20,165.32,0.22,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                if( add ) add->GetMotionMaster()->MovePoint(0,2060.01,2185.27,164.67);
+                if (add) add->GetMotionMaster()->MovePoint(0,2060.01,2185.27,164.67);
                 Wave_Timer = 15000;
                 break;
             case ENTRY_ARA_C_CONSOLE:
-                if( rand()%2 )
+                if (rand()%2)
                 {
                     add = m_creature->SummonCreature(ENTRY_ARA_TECH,4035.11,4038.97,194.27,2.57,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if( add ) add->GetMotionMaster()->MovePoint(0,4003.42,4040.19,193.49);
+                    if (add) add->GetMotionMaster()->MovePoint(0,4003.42,4040.19,193.49);
                     add = m_creature->SummonCreature(ENTRY_ARA_TECH,4033.66,4036.79,194.28,2.57,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if( add ) add->GetMotionMaster()->MovePoint(0,4003.42,4040.19,193.49);
+                    if (add) add->GetMotionMaster()->MovePoint(0,4003.42,4040.19,193.49);
                     add = m_creature->SummonCreature(ENTRY_ARA_TECH,4037.13,4037.30,194.23,2.57,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if( add ) add->GetMotionMaster()->MovePoint(0,4003.42,4040.19,193.49);
+                    if (add) add->GetMotionMaster()->MovePoint(0,4003.42,4040.19,193.49);
                 }
                 else
                 {
                     add = m_creature->SummonCreature(ENTRY_ARA_TECH,3099.59,4049.30,194.22,0.05,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if( add ) add->GetMotionMaster()->MovePoint(0,4028.01,4035.17,193.59);
+                    if (add) add->GetMotionMaster()->MovePoint(0,4028.01,4035.17,193.59);
                     add = m_creature->SummonCreature(ENTRY_ARA_TECH,3999.72,4046.75,194.22,0.05,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if( add ) add->GetMotionMaster()->MovePoint(0,4028.01,4035.17,193.59);
+                    if (add) add->GetMotionMaster()->MovePoint(0,4028.01,4035.17,193.59);
                     add = m_creature->SummonCreature(ENTRY_ARA_TECH,3996.81,4048.26,194.22,0.05,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if( add ) add->GetMotionMaster()->MovePoint(0,4028.01,4035.17,193.59);
+                    if (add) add->GetMotionMaster()->MovePoint(0,4028.01,4035.17,193.59);
                 }
                 Wave_Timer = 15000;
                 break;
@@ -185,48 +185,48 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI
     }
     void DoFinalSpawnForCreature(Creature *creature)
     {
-        switch( creature->GetEntry() )
+        switch(creature->GetEntry())
         {
             case ENTRY_BNAAR_C_CONSOLE:
                 add = m_creature->SummonCreature(ENTRY_SUNFURY_TECH,2946.52,4201.42,163.47,3.54,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                if( add ) add->GetMotionMaster()->MovePoint(0,2927.49,4192.81,163.00);
+                if (add) add->GetMotionMaster()->MovePoint(0,2927.49,4192.81,163.00);
                 break;
             case ENTRY_CORUU_C_CONSOLE:
                 add = m_creature->SummonCreature(ENTRY_SUNFURY_TECH,2453.88,2737.85,133.27,2.59,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                if( add ) add->GetMotionMaster()->MovePoint(0,2433.96,2751.53,133.85);
+                if (add) add->GetMotionMaster()->MovePoint(0,2433.96,2751.53,133.85);
                 add = m_creature->SummonCreature(ENTRY_SUNFURY_TECH,2441.62,2735.32,134.49,1.97,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                if( add ) add->GetMotionMaster()->MovePoint(0,2433.96,2751.53,133.85);
+                if (add) add->GetMotionMaster()->MovePoint(0,2433.96,2751.53,133.85);
                 add = m_creature->SummonCreature(ENTRY_SUNFURY_TECH,2450.73,2754.50,134.49,3.29,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                if( add ) add->GetMotionMaster()->MovePoint(0,2433.96,2751.53,133.85);
+                if (add) add->GetMotionMaster()->MovePoint(0,2433.96,2751.53,133.85);
                 break;
             case ENTRY_DURO_C_CONSOLE:
                 add = m_creature->SummonCreature(ENTRY_SUNFURY_TECH,2956.18,2202.85,165.32,5.45,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                if( add ) add->GetMotionMaster()->MovePoint(0,2972.27,2193.22,164.48);
+                if (add) add->GetMotionMaster()->MovePoint(0,2972.27,2193.22,164.48);
                 add = m_creature->SummonCreature(ENTRY_SUNFURY_TECH,2975.30,2211.50,165.32,4.55,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                if( add ) add->GetMotionMaster()->MovePoint(0,2972.27,2193.22,164.48);
+                if (add) add->GetMotionMaster()->MovePoint(0,2972.27,2193.22,164.48);
                 add = m_creature->SummonCreature(ENTRY_SUNFURY_PROT,2965.02,2217.45,164.16,4.96,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                if( add ) add->GetMotionMaster()->MovePoint(0,2972.27,2193.22,164.48);
+                if (add) add->GetMotionMaster()->MovePoint(0,2972.27,2193.22,164.48);
                 break;
             case ENTRY_ARA_C_CONSOLE:
                 add = m_creature->SummonCreature(ENTRY_ARA_ENGI,3994.51,4020.46,192.18,0.91,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                if( add ) add->GetMotionMaster()->MovePoint(0,4008.35,4035.04,192.70);
+                if (add) add->GetMotionMaster()->MovePoint(0,4008.35,4035.04,192.70);
                 add = m_creature->SummonCreature(ENTRY_ARA_GORKLONN,4021.56,4059.35,193.59,4.44,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                if( add ) add->GetMotionMaster()->MovePoint(0,4016.62,4039.89,193.46);
+                if (add) add->GetMotionMaster()->MovePoint(0,4016.62,4039.89,193.46);
                 break;
         }
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if( Event_Timer < diff )
+        if (Event_Timer < diff)
         {
             switch(Phase)
             {
                 case 1:
-                    if( someplayer )
+                    if (someplayer)
                     {
                         Unit* u = Unit::GetUnit((*m_creature), someplayer);
-                        if( u && u->GetTypeId() == TYPEID_PLAYER ) DoScriptText(EMOTE_START, m_creature, u);
+                        if (u && u->GetTypeId() == TYPEID_PLAYER) DoScriptText(EMOTE_START, m_creature, u);
                     }
                     Event_Timer = 60000;
                     Wave = true;
@@ -251,16 +251,16 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI
                     break;
                 case 5:
                     DoScriptText(EMOTE_COMPLETE, m_creature);
-                    if( someplayer )
+                    if (someplayer)
                     {
                         Unit* u = Unit::GetUnit((*m_creature),someplayer);
-                        if( u && u->GetTypeId() == TYPEID_PLAYER )
+                        if (u && u->GetTypeId() == TYPEID_PLAYER)
                             CAST_PLR(u)->KilledMonsterCredit(m_creature->GetEntry(),m_creature->GetGUID());
                         DoCast(m_creature,SPELL_DISABLE_VISUAL);
                     }
-                    if( goConsole )
+                    if (goConsole)
                     {
-                        if( GameObject* go = GameObject::GetGameObject((*m_creature),goConsole) )
+                        if (GameObject* go = GameObject::GetGameObject((*m_creature),goConsole))
                             go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
                     }
                     ++Phase;
@@ -268,9 +268,9 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI
             }
         } else Event_Timer -= diff;
 
-        if( Wave )
+        if (Wave)
         {
-            if( Wave_Timer < diff )
+            if (Wave_Timer < diff)
             {
                 DoWaveSpawnForCreature(m_creature);
             } else Wave_Timer -= diff;
@@ -287,44 +287,44 @@ CreatureAI* GetAI_npc_manaforge_control_console(Creature *_Creature)
 ######*/
 
 //TODO: clean up this workaround when Trinity adds support to do it properly (with gossip selections instead of instant summon)
-bool GOHello_go_manaforge_control_console(Player *player, GameObject* _GO)
+bool GOHello_go_manaforge_control_console(Player* pPlayer, GameObject* _GO)
 {
     if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
     {
-        player->PrepareQuestMenu(_GO->GetGUID());
-        player->SendPreparedQuest(_GO->GetGUID());
+        pPlayer->PrepareQuestMenu(_GO->GetGUID());
+        pPlayer->SendPreparedQuest(_GO->GetGUID());
     }
 
     Creature* manaforge;
     manaforge = NULL;
 
-    switch( _GO->GetAreaId() )
+    switch(_GO->GetAreaId())
     {
         case 3726:                                          //b'naar
-            if( (player->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) &&
-                player->HasItemCount(29366,1))
-                manaforge = player->SummonCreature(ENTRY_BNAAR_C_CONSOLE,2918.95,4189.98,161.88,0.34,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
+            if ((pPlayer->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) &&
+                pPlayer->HasItemCount(29366,1))
+                manaforge = pPlayer->SummonCreature(ENTRY_BNAAR_C_CONSOLE,2918.95,4189.98,161.88,0.34,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
             break;
         case 3730:                                          //coruu
-            if( (player->GetQuestStatus(10321) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10330) == QUEST_STATUS_INCOMPLETE) &&
-                player->HasItemCount(29396,1))
-                manaforge = player->SummonCreature(ENTRY_CORUU_C_CONSOLE,2426.77,2750.38,133.24,2.14,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
+            if ((pPlayer->GetQuestStatus(10321) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10330) == QUEST_STATUS_INCOMPLETE) &&
+                pPlayer->HasItemCount(29396,1))
+                manaforge = pPlayer->SummonCreature(ENTRY_CORUU_C_CONSOLE,2426.77,2750.38,133.24,2.14,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
             break;
         case 3734:                                          //duro
-            if( (player->GetQuestStatus(10322) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10338) == QUEST_STATUS_INCOMPLETE) &&
-                player->HasItemCount(29397,1))
-                manaforge = player->SummonCreature(ENTRY_DURO_C_CONSOLE,2976.48,2183.29,163.20,1.85,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
+            if ((pPlayer->GetQuestStatus(10322) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10338) == QUEST_STATUS_INCOMPLETE) &&
+                pPlayer->HasItemCount(29397,1))
+                manaforge = pPlayer->SummonCreature(ENTRY_DURO_C_CONSOLE,2976.48,2183.29,163.20,1.85,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
             break;
         case 3722:                                          //ara
-            if( (player->GetQuestStatus(10323) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10365) == QUEST_STATUS_INCOMPLETE) &&
-                player->HasItemCount(29411,1))
-                manaforge = player->SummonCreature(ENTRY_ARA_C_CONSOLE,4013.71,4028.76,192.10,1.25,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
+            if ((pPlayer->GetQuestStatus(10323) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10365) == QUEST_STATUS_INCOMPLETE) &&
+                pPlayer->HasItemCount(29411,1))
+                manaforge = pPlayer->SummonCreature(ENTRY_ARA_C_CONSOLE,4013.71,4028.76,192.10,1.25,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
             break;
     }
 
-    if( manaforge )
+    if (manaforge)
     {
-        CAST_AI(npc_manaforge_control_consoleAI, manaforge->AI())->someplayer = player->GetGUID();
+        CAST_AI(npc_manaforge_control_consoleAI, manaforge->AI())->someplayer = pPlayer->GetGUID();
         CAST_AI(npc_manaforge_control_consoleAI, manaforge->AI())->goConsole = _GO->GetGUID();
         _GO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
     }
@@ -364,7 +364,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
     npc_commander_dawnforgeAI(Creature *c) : ScriptedAI(c) { Reset (); }
 
 
-    uint64 playerGUID;
+    uint64 PlayerGUID;
     uint64 ardonisGUID;
     uint64 pathaleonGUID;
 
@@ -379,7 +379,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
 
     void Reset()
     {
-        playerGUID = 0;
+        PlayerGUID = 0;
         ardonisGUID = 0;
         pathaleonGUID = 0;
 
@@ -401,9 +401,9 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
     {
         Creature *ardonis = Unit::GetCreature(*m_creature,ardonisGUID);
         Creature *pathaleon = Unit::GetCreature(*m_creature,pathaleonGUID);
-        Player *player = Unit::GetPlayer(playerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!ardonis || !pathaleon || !player)
+        if (!ardonis || !pathaleon || !pPlayer)
             return;
 
         //Calculate the angle to Pathaleon
@@ -412,10 +412,10 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
 
         //Turn Dawnforge and update
         m_creature->SetOrientation(angle_dawnforge);
-        m_creature->SendUpdateToPlayer(player);
+        m_creature->SendUpdateToPlayer(pPlayer);
         //Turn Ardonis and update
         ardonis->SetOrientation(angle_ardonis);
-        ardonis->SendUpdateToPlayer(player);
+        ardonis->SendUpdateToPlayer(pPlayer);
 
         //Set them to kneel
         m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
@@ -427,9 +427,9 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
     {
         if (Unit *ardonis = Unit::GetUnit(*m_creature,ardonisGUID))
         {
-            Player *player = Unit::GetPlayer(playerGUID);
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-            if (!player)
+            if (!pPlayer)
                 return;
 
             angle_dawnforge = m_creature->GetAngle(ardonis->GetPositionX(), ardonis->GetPositionY());
@@ -437,10 +437,10 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
 
             //Turn Dawnforge and update
             m_creature->SetOrientation(angle_dawnforge);
-            m_creature->SendUpdateToPlayer(player);
+            m_creature->SendUpdateToPlayer(pPlayer);
             //Turn Ardonis and update
             ardonis->SetOrientation(angle_ardonis);
-            ardonis->SendUpdateToPlayer(player);
+            ardonis->SendUpdateToPlayer(pPlayer);
 
             //Set state
             m_creature->SetStandState(UNIT_STAND_STATE_STAND);
@@ -448,7 +448,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
         }
     }
 
-    bool CanStartEvent(Player *player)
+    bool CanStartEvent(Player* pPlayer)
     {
         if (!isEvent)
         {
@@ -457,7 +457,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
                 return false;
 
             ardonisGUID = ardonis->GetGUID();
-            playerGUID = player->GetGUID();
+            PlayerGUID = pPlayer->GetGUID();
 
             isEvent = true;
 
@@ -484,9 +484,9 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
 
         Unit *ardonis = Unit::GetUnit(*m_creature,ardonisGUID);
         Unit *pathaleon = Unit::GetUnit(*m_creature,pathaleonGUID);
-        Player *player = Unit::GetPlayer(playerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!ardonis || !player)
+        if (!ardonis || !pPlayer)
         {
             Reset();
             return;
@@ -594,7 +594,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
             //Phase 10 Dawnforge say
         case 10:
             DoScriptText(SAY_COMMANDER_DAWNFORGE_5, m_creature);
-            player->AreaExploredOrEventHappens(QUEST_INFO_GATHERING);
+            pPlayer->AreaExploredOrEventHappens(QUEST_INFO_GATHERING);
             Reset();
             break;
         }
@@ -606,20 +606,20 @@ CreatureAI* GetAI_npc_commander_dawnforge(Creature* _Creature)
     return new npc_commander_dawnforgeAI(_Creature);
 }
 
-bool AreaTrigger_at_commander_dawnforge(Player *player, AreaTriggerEntry *at)
+bool AreaTrigger_at_commander_dawnforge(Player* pPlayer, AreaTriggerEntry *at)
 {
     //if player lost aura or not have at all, we should not try start event.
-    if (!player->HasAura(SPELL_SUNFURY_DISGUISE))
+    if (!pPlayer->HasAura(SPELL_SUNFURY_DISGUISE))
         return false;
 
-    if (player->isAlive() && player->GetQuestStatus(QUEST_INFO_GATHERING) == QUEST_STATUS_INCOMPLETE)
+    if (pPlayer->isAlive() && pPlayer->GetQuestStatus(QUEST_INFO_GATHERING) == QUEST_STATUS_INCOMPLETE)
     {
-        Creature* Dawnforge = player->FindNearestCreature(CreatureEntry[1], 30.0f);
+        Creature* Dawnforge = pPlayer->FindNearestCreature(CreatureEntry[1], 30.0f);
 
         if (!Dawnforge)
             return false;
 
-        if(CAST_AI(npc_commander_dawnforgeAI, Dawnforge->AI())->CanStartEvent(player))
+        if (CAST_AI(npc_commander_dawnforgeAI, Dawnforge->AI())->CanStartEvent(pPlayer))
             return true;
     }
     return false;
@@ -636,34 +636,34 @@ bool AreaTrigger_at_commander_dawnforge(Player *player, AreaTriggerEntry *at)
 #define QUEST_DIMENSIUS 10439
 #define QUEST_ON_NETHERY_WINGS 10438
 
-bool GossipHello_npc_professor_dabiri(Player *player, Creature *_Creature)
+bool GossipHello_npc_professor_dabiri(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if(player->GetQuestStatus(QUEST_ON_NETHERY_WINGS) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(29778, 1))
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(QUEST_ON_NETHERY_WINGS) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(29778, 1))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_professor_dabiri(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_professor_dabiri(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        _Creature->CastSpell(player, SPELL_PHASE_DISTRUPTOR, false);
-        player->CLOSE_GOSSIP_MENU();
+        _Creature->CastSpell(pPlayer, SPELL_PHASE_DISTRUPTOR, false);
+        pPlayer->CLOSE_GOSSIP_MENU();
     }
 
     return true;
 }
 
-bool QuestAccept_npc_professor_dabiri(Player *player, Creature *creature, Quest const *quest )
+bool QuestAccept_npc_professor_dabiri(Player* pPlayer, Creature *creature, Quest const *quest)
 {
-    if(quest->GetQuestId() == QUEST_DIMENSIUS)
-        DoScriptText(WHISPER_DABIRI, creature, player);
+    if (quest->GetQuestId() == QUEST_DIMENSIUS)
+        DoScriptText(WHISPER_DABIRI, creature, pPlayer);
 
     return true;
 }
@@ -710,8 +710,8 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(Player *player = who->GetCharmerOrOwnerPlayerOrPlayerItself())
-            PlayerGUID = player->GetGUID();
+        if (Player* pPlayer = who->GetCharmerOrOwnerPlayerOrPlayerItself())
+            PlayerGUID = pPlayer->GetGUID();
     }
 
     void SpellHit(Unit *caster, const SpellEntry *spell)
@@ -721,38 +721,38 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!Materialize)
+        if (!Materialize)
         {
             DoCast(m_creature, SPELL_MATERIALIZE);
             Materialize = true;
         }
 
-        if(m_creature->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED) || m_creature->hasUnitState(UNIT_STAT_ROOT)) // if the mob is rooted/slowed by spells eg.: Entangling Roots, Frost Nova, Hamstring, Crippling Poison, etc. => remove it
+        if (m_creature->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED) || m_creature->hasUnitState(UNIT_STAT_ROOT)) // if the mob is rooted/slowed by spells eg.: Entangling Roots, Frost Nova, Hamstring, Crippling Poison, etc. => remove it
             DoCast(m_creature, SPELL_PHASE_SLIP);
 
         if (!UpdateVictim())
             return;
 
-        if(ManaBurnTimer < diff) // cast Mana Burn
+        if (ManaBurnTimer < diff) // cast Mana Burn
         {
-            if(m_creature->getVictim()->GetCreateMana() > 0)
+            if (m_creature->getVictim()->GetCreateMana() > 0)
             {
                 DoCast(m_creature->getVictim(), SPELL_MANA_BURN);
                 ManaBurnTimer = 8000 + (rand()%10 * 1000); // 8-18 sec cd
             }
         }else ManaBurnTimer -= diff;
 
-        if(PlayerGUID) // start: support for quest 10190
+        if (PlayerGUID) // start: support for quest 10190
         {
             Unit* target = Unit::GetUnit((*m_creature), PlayerGUID);
 
-            if(target && !Weak && m_creature->GetHealth() < (m_creature->GetMaxHealth() / 100 * WeakPercent)
+            if (target && !Weak && m_creature->GetHealth() < (m_creature->GetMaxHealth() / 100 * WeakPercent)
                 && CAST_PLR(target)->GetQuestStatus(10190) == QUEST_STATUS_INCOMPLETE)
             {
                 DoScriptText(EMOTE_WEAK, m_creature);
                 Weak = true;
             }
-            if(Weak && !Drained && m_creature->HasAura(34219))
+            if (Weak && !Drained && m_creature->HasAura(34219))
             {
                 Drained = true;
 
@@ -765,10 +765,10 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI
 
                 Creature* DrainedPhaseHunter = NULL;
 
-                if(!DrainedPhaseHunter)
+                if (!DrainedPhaseHunter)
                     DrainedPhaseHunter = m_creature->SummonCreature(SUMMONED_MOB, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), m_creature->GetOrientation(), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); // summon the mob
 
-                if(DrainedPhaseHunter)
+                if (DrainedPhaseHunter)
                 {
                     DrainedPhaseHunter->SetLevel(Level); // set the summoned mob's data
                     DrainedPhaseHunter->SetHealth(Health);
@@ -809,16 +809,16 @@ struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI
     {
         if (PlayerGUID)
         {
-            if (Player* player = Unit::GetPlayer(PlayerGUID))
-                CAST_PLR(player)->FailQuest(Q_ALMABTRIEB);
+            if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
+                CAST_PLR(pPlayer)->FailQuest(Q_ALMABTRIEB);
         }
     }
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!player)
+        if (!pPlayer)
             return;
 
         switch(i)
@@ -835,18 +835,18 @@ struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI
                 break;
 
             case 12:
-                if (player)
+                if (pPlayer)
                 {
-                    CAST_PLR(player)->GroupEventHappens(Q_ALMABTRIEB, m_creature);
+                    CAST_PLR(pPlayer)->GroupEventHappens(Q_ALMABTRIEB, m_creature);
                     Completed = true;
                 }
                 {Unit* Thadell = me->FindNearestCreature(N_THADELL, 30);
-                if(Thadell)
+                if (Thadell)
                     DoScriptText(SAY_THADELL_1, m_creature);}break;
             case 13:
                 {Unit* Thadell = me->FindNearestCreature(N_THADELL, 30);
-                if(Thadell)
-                    DoScriptText(SAY_THADELL_2, m_creature, player);}break;
+                if (Thadell)
+                    DoScriptText(SAY_THADELL_2, m_creature, pPlayer);}break;
         }
     }
 
@@ -870,13 +870,13 @@ struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI
 
 };
 
-bool QuestAccept_npc_bessy(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_bessy(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == Q_ALMABTRIEB)
     {
         creature->setFaction(113);
         creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp b/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp
index c79ac6be53f..06019cc2b0b 100644
--- a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/boss_malygos.cpp
@@ -96,11 +96,11 @@ struct TRINITY_DLL_DECL boss_malygosAI : public ScriptedAI
     }
     void EnterCombat(Unit* who)
     {
-        if(phase == 1)
+        if (phase == 1)
             DoScriptText(SAY_PHASE1_AGGRO, m_creature);
-        if(phase == 2)
+        if (phase == 2)
             DoScriptText(SAY_PHASE1_AGGRO, m_creature);
-        if(phase == 3)
+        if (phase == 3)
             DoScriptText(SAY_PHASE1_AGGRO, m_creature);
     }
     void AttackStart(Unit* who) {}
@@ -109,7 +109,7 @@ struct TRINITY_DLL_DECL boss_malygosAI : public ScriptedAI
     {
         phase =1;
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) <= 50){
@@ -130,21 +130,21 @@ struct TRINITY_DLL_DECL boss_malygosAI : public ScriptedAI
         if (victim == m_creature)
             return;
 
-        if(phase ==1)
+        if (phase ==1)
             switch(rand()%3)
             {
                 case 0: DoScriptText(SAY_PHASE1_SLAY_1, m_creature); break;
                 case 1: DoScriptText(SAY_PHASE1_SLAY_2, m_creature);break;
                 case 2: DoScriptText(SAY_PHASE1_SLAY_3, m_creature);break;
             }
-        if(phase ==2)
+        if (phase ==2)
             switch(rand()%3)
             {
                 case 0: DoScriptText(SAY_PHASE2_SLAY_1, m_creature);break;
                 case 1: DoScriptText(SAY_PHASE2_SLAY_2, m_creature);break;
                 case 2: DoScriptText(SAY_PHASE2_SLAY_3, m_creature);break;
             }
-        if(phase ==3)
+        if (phase ==3)
             switch(rand()%3)
             {
                 case 0: DoScriptText(SAY_PHASE3_SLAY_1, m_creature);break;
diff --git a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/instance_eye_of_eternity.cpp b/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
index 600da8a55ba..7c89a117d92 100644
--- a/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
@@ -3,12 +3,12 @@
 
 struct TRINITY_DLL_DECL instance_eye_of_eternity : public ScriptedInstance
 {
-    instance_eye_of_eternity(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_eye_of_eternity(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 };
 
-InstanceData* GetInstanceData_instance_eye_of_eternity(Map* map)
+InstanceData* GetInstanceData_instance_eye_of_eternity(Map* pMap)
 {
-    return new instance_eye_of_eternity(map);
+    return new instance_eye_of_eternity(pMap);
 }
 
 void AddSC_instance_eye_of_eternity()
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp
index d2469c53a8e..3d597ae58b1 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp
@@ -86,7 +86,7 @@ struct TRINITY_DLL_DECL boss_anomalusAI : public ScriptedAI
 
         DeadChaoticRift = false;
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ANOMALUS_EVENT, NOT_STARTED);
     }
 
@@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL boss_anomalusAI : public ScriptedAI
     {
         DoScriptText(SAY_AGGRO, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ANOMALUS_EVENT, IN_PROGRESS);
     }
 
@@ -102,22 +102,22 @@ struct TRINITY_DLL_DECL boss_anomalusAI : public ScriptedAI
     {
         DoScriptText(SAY_DEATH, m_creature);
 
-        if(HeroicMode && !DeadChaoticRift)
+        if (HeroicMode && !DeadChaoticRift)
         {
             AchievementEntry const *AchievChaosTheory = GetAchievementStore()->LookupEntry(ACHIEVEMENT_CHAOS_THEORY);
-            if(AchievChaosTheory)
+            if (AchievChaosTheory)
             {
-                Map *map = m_creature->GetMap();
-                if(map && map->IsDungeon())
+                Map* pMap = m_creature->GetMap();
+                if (pMap && pMap->IsDungeon())
                 {
-                    Map::PlayerList const &players = map->GetPlayers();
+                    Map::PlayerList const &players = pMap->GetPlayers();
                     for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievChaosTheory);
                 }
             }
         }
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ANOMALUS_EVENT, DONE);
     }
 
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp
index e8ed74c2780..9468bc52664 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp
@@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI
 
         RemovePrison(CheckContainmentSpheres());
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_KERISTRASZA_EVENT, NOT_STARTED);
     }
 
@@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI
         DoScriptText(SAY_AGGRO, m_creature);
         DoCastAOE(SPELL_INTENSE_COLD);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_KERISTRASZA_EVENT, IN_PROGRESS);
     }
 
@@ -101,22 +101,22 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI
     {
         DoScriptText(SAY_DEATH, m_creature);
 
-        if(HeroicMode && !MoreThanTwoIntenseCold)
+        if (HeroicMode && !MoreThanTwoIntenseCold)
         {
             AchievementEntry const *AchievIntenseCold = GetAchievementStore()->LookupEntry(ACHIEVEMENT_INTENSE_COLD);
-            if(AchievIntenseCold)
+            if (AchievIntenseCold)
             {
-                Map *map = m_creature->GetMap();
-                if(map && map->IsDungeon())
+                Map* pMap = m_creature->GetMap();
+                if (pMap && pMap->IsDungeon())
                 {
-                    Map::PlayerList const &players = map->GetPlayers();
+                    Map::PlayerList const &players = pMap->GetPlayers();
                     for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievIntenseCold);
                 }
             }
         }
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_KERISTRASZA_EVENT, DONE);
     }
 
@@ -136,23 +136,23 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI
         for(uint8 i = 0; i < CONTAINMENT_SPHERES; ++i)
         {
             ContainmentSpheres[i] = pInstance->instance->GetGameObject(ContainmentSphereGUIDs[i]);
-            if(!ContainmentSpheres[i])
+            if (!ContainmentSpheres[i])
                 return false;
-            if(ContainmentSpheres[i]->GetGoState() != GO_STATE_ACTIVE)
+            if (ContainmentSpheres[i]->GetGoState() != GO_STATE_ACTIVE)
                 return false;
         }
-        if(remove_prison)
+        if (remove_prison)
             RemovePrison(true);
         return true;
     }
 
     void RemovePrison(bool remove)
     {
-        if(remove)
+        if (remove)
         {
             m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
             m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-            if(m_creature->HasAura(SPELL_FROZEN_PRISON))
+            if (m_creature->HasAura(SPELL_FROZEN_PRISON))
                 m_creature->RemoveAurasDueToSpell(SPELL_FROZEN_PRISON);
         }
         else
@@ -168,17 +168,17 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(CheckIntenseColdTimer < diff && !MoreThanTwoIntenseCold)
+        if (CheckIntenseColdTimer < diff && !MoreThanTwoIntenseCold)
         {
             std::list<HostilReference*> ThreatList = m_creature->getThreatManager().getThreatList();
             for(std::list<HostilReference*>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); itr++)
             {
                 Unit *target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
-                if(!target || target->GetTypeId() != TYPEID_PLAYER)
+                if (!target || target->GetTypeId() != TYPEID_PLAYER)
                     continue;
 
                 Aura *AuraIntenseCold = target->GetAura(SPELL_INTENSE_COLD_TRIGGERED);
-                if(AuraIntenseCold && AuraIntenseCold->GetStackAmount() > 2)
+                if (AuraIntenseCold && AuraIntenseCold->GetStackAmount() > 2)
                 {
                     MoreThanTwoIntenseCold = true;
                     break;
@@ -231,7 +231,7 @@ bool GOHello_containment_sphere(Player *pPlayer, GameObject *pGO)
     ScriptedInstance *pInstance = pGO->GetInstanceData();
 
     Creature *Keristrasza = Unit::GetCreature(*pGO, pInstance->GetData64(DATA_KERISTRASZA));
-    if(Keristrasza && Keristrasza->isAlive())
+    if (Keristrasza && Keristrasza->isAlive())
     {
         // maybe these are hacks :(
         pGO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp
index b3bfee11a66..58a0e928381 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_magus_telestra.cpp
@@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI
         m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
         m_creature->SetVisibility(VISIBILITY_ON);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED);
     }
 
@@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI
     {
         DoScriptText(SAY_AGGRO, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS);
     }
 
@@ -256,9 +256,9 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI
             return;
         }
 
-        if(Cooldown)
+        if (Cooldown)
         {
-            if(Cooldown < diff)
+            if (Cooldown < diff)
                 Cooldown = 0;
             else
             {
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp
index cc845dd5460..6f5bfe1f269 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp
@@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL boss_ormorokAI : public ScriptedAI
         Frenzy = false;
         CrystalSpikes = false;
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ORMOROK_EVENT, NOT_STARTED);
     }
 
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp
index 1ad4253355d..afb6fd59821 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/nexus/commander_kolurg.cpp
@@ -33,7 +33,7 @@ struct TRINITY_DLL_DECL boss_commander_kolurgAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp
index 49a35f4975f..532e982f5e6 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/nexus/commander_stoutbeard.cpp
@@ -36,7 +36,7 @@ struct TRINITY_DLL_DECL boss_commander_stoutbeardAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/instance_nexus.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/instance_nexus.cpp
index e622749592e..87e04fe307b 100644
--- a/src/bindings/scripts/scripts/zone/nexus/nexus/instance_nexus.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/nexus/instance_nexus.cpp
@@ -28,7 +28,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance
 {
-    instance_nexus(Map *Map) : ScriptedInstance(Map) { Initialize(); }
+    instance_nexus(Map* pMap) : ScriptedInstance(pMap) { Initialize(); }
 
     uint32 Encounters[NUMBER_OF_ENCOUNTERS];
 
@@ -114,21 +114,21 @@ struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance
             case 188527:
             {
                 AnomalusContainmentSphere = go->GetGUID();
-                if(Encounters[1] == DONE)
+                if (Encounters[1] == DONE)
                     go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
                 break;
             }
             case 188528:
             {
                 OrmoroksContainmentSphere = go->GetGUID();
-                if(Encounters[2] == DONE)
+                if (Encounters[2] == DONE)
                     go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
                 break;
             }
             case 188526:
             {
                 TelestrasContainmentSphere = go->GetGUID();
-                if(Encounters[0] == DONE)
+                if (Encounters[0] == DONE)
                     go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
                 break;
             }
@@ -153,10 +153,10 @@ struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance
         {
             case DATA_MAGUS_TELESTRA_EVENT:
             {
-                if(data == DONE)
+                if (data == DONE)
                 {
                     GameObject *Sphere = instance->GetGameObject(TelestrasContainmentSphere);
-                    if(Sphere)
+                    if (Sphere)
                         Sphere->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
                 }
                 Encounters[0] = data;
@@ -164,10 +164,10 @@ struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance
             }
             case DATA_ANOMALUS_EVENT:
             {
-                if(data == DONE)
+                if (data == DONE)
                 {
                     GameObject *Sphere = instance->GetGameObject(AnomalusContainmentSphere);
-                    if(Sphere)
+                    if (Sphere)
                         Sphere->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
                 }
                 Encounters[1] = data;
@@ -175,10 +175,10 @@ struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance
             }
             case DATA_ORMOROK_EVENT:
             {
-                if(data == DONE)
+                if (data == DONE)
                 {
                     GameObject *Sphere = instance->GetGameObject(OrmoroksContainmentSphere);
-                    if(Sphere)
+                    if (Sphere)
                         Sphere->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1);
                 }
                 Encounters[2] = data;
@@ -243,9 +243,9 @@ struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_nexus(Map* map)
+InstanceData* GetInstanceData_instance_nexus(Map* pMap)
 {
-    return new instance_nexus(map);
+    return new instance_nexus(pMap);
 }
 
 void AddSC_instance_nexus()
diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp
index c0f7c589403..06827070ea0 100644
--- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_drakos.cpp
@@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL boss_drakosAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
@@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_drakosAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%3)
         {
diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp
index 998f526ca80..3eee234fdd1 100644
--- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_eregos.cpp
@@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL boss_eregosAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         phase =1;
diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp
index 8c09f0c6f4b..d3f5a08ecbd 100644
--- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_urom.cpp
@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_uromAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
@@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_uromAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%3)
         {
diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp
index faaee9c7c42..908e7bedbf8 100644
--- a/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/oculus/boss_varos.cpp
@@ -48,7 +48,7 @@ struct TRINITY_DLL_DECL boss_varosAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
@@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL boss_varosAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%2)
         {
diff --git a/src/bindings/scripts/scripts/zone/nexus/oculus/instance_oculus.cpp b/src/bindings/scripts/scripts/zone/nexus/oculus/instance_oculus.cpp
index dd223372da0..b5ceee9e5ed 100644
--- a/src/bindings/scripts/scripts/zone/nexus/oculus/instance_oculus.cpp
+++ b/src/bindings/scripts/scripts/zone/nexus/oculus/instance_oculus.cpp
@@ -3,12 +3,12 @@
 
 struct TRINITY_DLL_DECL instance_oculus : public ScriptedInstance
 {
-    instance_oculus(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_oculus(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 };
 
-InstanceData* GetInstanceData_instance_oculus(Map* map)
+InstanceData* GetInstanceData_instance_oculus(Map* pMap)
 {
-    return new instance_oculus(map);
+    return new instance_oculus(pMap);
 }
 
 void AddSC_instance_oculus()
diff --git a/src/bindings/scripts/scripts/zone/obsidian_sanctum/instance_obsidian_sanctum.cpp b/src/bindings/scripts/scripts/zone/obsidian_sanctum/instance_obsidian_sanctum.cpp
index 8eacaf77880..871d0b5ff61 100644
--- a/src/bindings/scripts/scripts/zone/obsidian_sanctum/instance_obsidian_sanctum.cpp
+++ b/src/bindings/scripts/scripts/zone/obsidian_sanctum/instance_obsidian_sanctum.cpp
@@ -9,7 +9,7 @@
 
 struct TRINITY_DLL_DECL instance_obsidian_sanctum : public ScriptedInstance
 {
-    instance_obsidian_sanctum(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_obsidian_sanctum(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 m_uiEncounter[ENCOUNTERS];
     uint64 m_uiSartharionGUID;
@@ -83,9 +83,9 @@ struct TRINITY_DLL_DECL instance_obsidian_sanctum : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_obsidian_sanctum(Map* map)
+InstanceData* GetInstanceData_instance_obsidian_sanctum(Map* pMap)
 {
-    return new instance_obsidian_sanctum(map);
+    return new instance_obsidian_sanctum(pMap);
 }
 
 void AddSC_instance_obsidian_sanctum()
diff --git a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp
index ceea0a66d85..4925762d6aa 100644
--- a/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp
+++ b/src/bindings/scripts/scripts/zone/onyxias_lair/boss_onyxia.cpp
@@ -116,10 +116,10 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 60) && (Phase == 1))
+        if (((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 60) && (Phase == 1))
         {
             Phase = 2;
             m_creature->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
@@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
             DoScriptText(SAY_PHASE_2_TRANS, m_creature);
         }
 
-        if(((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 40) && (Phase == 2))
+        if (((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 40) && (Phase == 2))
         {
             Phase = 3;
             m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
@@ -141,54 +141,54 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
             m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
         }
 
-        if(Phase == 1 || Phase == 3)
+        if (Phase == 1 || Phase == 3)
         {
-            if(FlameBreathTimer < diff)
+            if (FlameBreathTimer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_FLAMEBREATH);
                 FlameBreathTimer = 15000;
             }else FlameBreathTimer -= diff;
 
-            if(TailSweepTimer < diff)
+            if (TailSweepTimer < diff)
             {
                 Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-                if(target && !m_creature->HasInArc(M_PI, target))
+                if (target && !m_creature->HasInArc(M_PI, target))
                     DoCast(target, SPELL_TAILSWEEP);
 
                 TailSweepTimer = 10000;
             }else TailSweepTimer -= diff;
 
-            if(CleaveTimer < diff)
+            if (CleaveTimer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_CLEAVE);
                 CleaveTimer = 10000;
             }else CleaveTimer -= diff;
 
-            if(WingBuffetTimer < diff)
+            if (WingBuffetTimer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_WINGBUFFET);
                 WingBuffetTimer = 7000 + ((rand()%8)*1000);
             }else WingBuffetTimer -= diff;
 
-            if(KnockAwayTimer < diff)
+            if (KnockAwayTimer < diff)
             {
-                if(rand() <= 30)
+                if (rand() <= 30)
                 {
                     DoCast(m_creature->getVictim(), SPELL_KNOCK_AWAY);
                 }
                 KnockAwayTimer = 15000;
             }else KnockAwayTimer -= diff;
 
-            if(Phase == 3)
+            if (Phase == 3)
             {
-                if(BellowingRoarTimer < diff)
+                if (BellowingRoarTimer < diff)
                 {
                     DoCast(m_creature->getVictim(), SPELL_BELLOWINGROAR);
 
                     BellowingRoarTimer = 30000;
                 }else BellowingRoarTimer -= diff;
 
-                if(SummonWhelpsTimer < diff)
+                if (SummonWhelpsTimer < diff)
                 {
                     SummonWhelps(Phase);
 
@@ -199,9 +199,9 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
             DoMeleeAttackIfReady();
         }
 
-        if(Phase == 2)
+        if (Phase == 2)
         {
-            if(InitialSpawn)
+            if (InitialSpawn)
             {
                 InitialSpawn = false;
 
@@ -209,12 +209,12 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
                 {
                     uint32 random = rand()%4;
                     Creature* Whelp = m_creature->SummonCreature(CREATURE_WHELP, SpawnLocations[random][0], SpawnLocations[random][1], SpawnLocations[random][2], 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
-                    if(Whelp)
+                    if (Whelp)
                         Whelp->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
                 }
             }
 
-            if(EngulfingFlamesTimer < diff)
+            if (EngulfingFlamesTimer < diff)
             {
                 DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_ENGULFINGFLAMES);
                 m_creature->HandleEmoteCommand(ANIM_FLY);
@@ -223,7 +223,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
             }
             else EngulfingFlamesTimer -= diff;
 
-            if(FireballTimer < diff)
+            if (FireballTimer < diff)
             {
                 DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_FIREBALL);
 
@@ -231,9 +231,9 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
             }
             else FireballTimer -= diff;
 
-            if(MovementTimer < diff)
+            if (MovementTimer < diff)
             {
-                if(rand()%100 < 30)
+                if (rand()%100 < 30)
                 {
                     DoScriptText(EMOTE_BREATH, m_creature);
                     DoCast(m_creature->getVictim(), SPELL_DEEPBREATH);
@@ -243,7 +243,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
                 MovementTimer = 25000;
             }else MovementTimer -= diff;
 
-            if(SummonWhelpsTimer < diff)
+            if (SummonWhelpsTimer < diff)
             {
                 SummonWhelps(Phase);
 
@@ -256,34 +256,34 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
     void ChangePosition()
     {
         uint32 random = rand() % 4;
-        if(random<4){
+        if (random<4){
             m_creature->GetMotionMaster()->MovePoint(0, MovementLocations[random][0], MovementLocations[random][1], MovementLocations[random][2]);}
     }
 
     void SummonWhelps(uint32 Phase)
     {
-        if(Phase == 2)
+        if (Phase == 2)
         {
             uint32 max = rand()%10;
             for(uint32 i = 0; i < max; ++i)
             {
                 uint32 random = rand()%3;
                 Creature* Whelp = m_creature->SummonCreature(CREATURE_WHELP, SpawnLocations[random][0], SpawnLocations[random][1], SpawnLocations[random][2], 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
-                if(Whelp)
+                if (Whelp)
                     Whelp->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
             }
         }
 
-        if(Phase == 3)
+        if (Phase == 3)
         {
             uint32 max = rand() % 10 +1;
-            if(max < 5)
+            if (max < 5)
             {
                 for(uint32 i = 0; i < max; ++i)
                 {
                     uint32 random = rand()%4;
                     Creature* Whelp = m_creature->SummonCreature(CREATURE_WHELP, SpawnLocations[random][0], SpawnLocations[random][1], SpawnLocations[random][2], 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
-                    if(Whelp)
+                    if (Whelp)
                         Whelp->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
                 }
             }
diff --git a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp
index daf71a0324d..03c733576a8 100644
--- a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp
+++ b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp
@@ -37,29 +37,29 @@ EndContentData */
 
 #define GOSSIP_HNF "You may speak frankly, Neeru..."
 #define GOSSIP_SNF "[PH] ..."
-bool GossipHello_npc_neeru_fireblade(Player *player, Creature *_Creature)
+bool GossipHello_npc_neeru_fireblade(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(QUEST_5727) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(QUEST_5727) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(4513, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(4513, _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_neeru_fireblade(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_neeru_fireblade(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->SEND_GOSSIP_MENU(4513, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(4513, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(QUEST_5727);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(QUEST_5727);
             break;
     }
     return true;
@@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL npc_shenthulAI : public ScriptedAI
     bool CanEmote;
     uint32 Salute_Timer;
     uint32 Reset_Timer;
-    uint64 playerGUID;
+    uint64 PlayerGUID;
 
     void Reset()
     {
@@ -90,18 +90,18 @@ struct TRINITY_DLL_DECL npc_shenthulAI : public ScriptedAI
         CanEmote = false;
         Salute_Timer = 6000;
         Reset_Timer = 0;
-        playerGUID = 0;
+        PlayerGUID = 0;
     }
 
     void EnterCombat(Unit* who) { }
 
     void UpdateAI(const uint32 diff)
     {
-        if( CanEmote )
+        if (CanEmote)
         {
             if (Reset_Timer < diff)
             {
-                if (Player* pPlayer = Unit::GetPlayer(playerGUID))
+                if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
                 {
                     if (pPlayer->GetTypeId() == TYPEID_PLAYER && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE)
                         pPlayer->FailQuest(QUEST_SHATTERED_SALUTE);
@@ -110,7 +110,7 @@ struct TRINITY_DLL_DECL npc_shenthulAI : public ScriptedAI
             } else Reset_Timer -= diff;
         }
 
-        if( CanTalk && !CanEmote )
+        if (CanTalk && !CanEmote)
         {
             if (Salute_Timer < diff)
             {
@@ -128,9 +128,9 @@ struct TRINITY_DLL_DECL npc_shenthulAI : public ScriptedAI
 
     void ReceiveEmote(Player* pPlayer, uint32 emote)
     {
-        if( emote == TEXTEMOTE_SALUTE && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE )
+        if (emote == TEXTEMOTE_SALUTE && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE)
         {
-            if(CanEmote)
+            if (CanEmote)
             {
                 pPlayer->AreaExploredOrEventHappens(QUEST_SHATTERED_SALUTE);
                 Reset();
@@ -144,12 +144,12 @@ CreatureAI* GetAI_npc_shenthul(Creature *_Creature)
     return new npc_shenthulAI (_Creature);
 }
 
-bool QuestAccept_npc_shenthul(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_shenthul(Player* pPlayer, Creature* creature, Quest const* quest)
 {
-    if( quest->GetQuestId() == QUEST_SHATTERED_SALUTE )
+    if (quest->GetQuestId() == QUEST_SHATTERED_SALUTE)
     {
         CAST_AI(npc_shenthulAI, creature->AI())->CanTalk = true;
-        CAST_AI(npc_shenthulAI, creature->AI())->playerGUID = player->GetGUID();
+        CAST_AI(npc_shenthulAI, creature->AI())->PlayerGUID = pPlayer->GetGUID();
     }
     return true;
 }
@@ -189,16 +189,16 @@ struct TRINITY_DLL_DECL npc_thrall_warchiefAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if( ChainLightning_Timer < diff )
+        if (ChainLightning_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_CHAIN_LIGHTNING);
             ChainLightning_Timer = 9000;
         }else ChainLightning_Timer -= diff;
 
-        if( Shock_Timer < diff )
+        if (Shock_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_SHOCK);
             Shock_Timer = 15000;
@@ -212,49 +212,49 @@ CreatureAI* GetAI_npc_thrall_warchief(Creature *_Creature)
     return new npc_thrall_warchiefAI (_Creature);
 }
 
-bool GossipHello_npc_thrall_warchief(Player *player, Creature *_Creature)
+bool GossipHello_npc_thrall_warchief(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(QUEST_6566) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HTW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(QUEST_6566) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HTW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_thrall_warchief(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_thrall_warchief(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->SEND_GOSSIP_MENU(5733, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(5733, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-            player->SEND_GOSSIP_MENU(5734, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+            pPlayer->SEND_GOSSIP_MENU(5734, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
-            player->SEND_GOSSIP_MENU(5735, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+            pPlayer->SEND_GOSSIP_MENU(5735, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-            player->SEND_GOSSIP_MENU(5736, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            pPlayer->SEND_GOSSIP_MENU(5736, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
-            player->SEND_GOSSIP_MENU(5737, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
+            pPlayer->SEND_GOSSIP_MENU(5737, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+6:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
-            player->SEND_GOSSIP_MENU(5738, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
+            pPlayer->SEND_GOSSIP_MENU(5738, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+7:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(QUEST_6566);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(QUEST_6566);
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/instance_razorfen_kraul.cpp b/src/bindings/scripts/scripts/zone/razorfen_kraul/instance_razorfen_kraul.cpp
index d796e125ed8..84f64d8a5b2 100644
--- a/src/bindings/scripts/scripts/zone/razorfen_kraul/instance_razorfen_kraul.cpp
+++ b/src/bindings/scripts/scripts/zone/razorfen_kraul/instance_razorfen_kraul.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_razorfen_kraul : public ScriptedInstance
 {
-    instance_razorfen_kraul(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_razorfen_kraul(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint64 DoorWardGUID;
     uint32 WardCheck_Timer;
@@ -90,9 +90,9 @@ struct TRINITY_DLL_DECL instance_razorfen_kraul : public ScriptedInstance
 
 };
 
-InstanceData* GetInstanceData_instance_razorfen_kraul(Map* map)
+InstanceData* GetInstanceData_instance_razorfen_kraul(Map* pMap)
 {
-    return new instance_razorfen_kraul(map);
+    return new instance_razorfen_kraul(pMap);
 }
 
 void AddSC_instance_razorfen_kraul()
diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp
index e7fba961340..53707ff657d 100644
--- a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp
+++ b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp
@@ -51,51 +51,51 @@ struct TRINITY_DLL_DECL npc_willixAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!player)
+        if (!pPlayer)
             return;
 
         switch (i)
         {
         case 3:
             m_creature->HandleEmoteCommand(EMOTE_STATE_POINT);
-            DoScriptText(SAY_POINT, m_creature, player);
+            DoScriptText(SAY_POINT, m_creature, pPlayer);
             break;
         case 4:
             m_creature->SummonCreature(ENTRY_BOAR, 2137.66, 1843.98, 48.08, 1.54, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
             break;
         case 8:
-            DoScriptText(SAY_BLUELEAF, m_creature, player);
+            DoScriptText(SAY_BLUELEAF, m_creature, pPlayer);
             break;
         case 9:
-            DoScriptText(SAY_DANGER, m_creature, player);
+            DoScriptText(SAY_DANGER, m_creature, pPlayer);
             break;
         case 13:
-            DoScriptText(SAY_BAD, m_creature, player);
+            DoScriptText(SAY_BAD, m_creature, pPlayer);
             break;
         case 14:
             m_creature->SummonCreature(ENTRY_BOAR, 2078.91, 1704.54, 56.77, 1.54, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
             break;
         case 25:
-            DoScriptText(SAY_THINK, m_creature, player);
+            DoScriptText(SAY_THINK, m_creature, pPlayer);
             break;
         case 31:
-            DoScriptText(SAY_SOON, m_creature, player);
+            DoScriptText(SAY_SOON, m_creature, pPlayer);
             break;
         case 42:
-            DoScriptText(SAY_FINALY, m_creature, player);
+            DoScriptText(SAY_FINALY, m_creature, pPlayer);
             break;
         case 43:
             m_creature->SummonCreature(ENTRY_BOAR, 1956.43, 1596.97, 81.75, 1.54,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
             break;
         case 45:
-            DoScriptText(SAY_WIN, m_creature, player);
-            if (player && player->GetTypeId() == TYPEID_PLAYER)
-                CAST_PLR(player)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER,m_creature);
+            DoScriptText(SAY_WIN, m_creature, pPlayer);
+            if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)
+                CAST_PLR(pPlayer)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER,m_creature);
             break;
         case 46:
-            DoScriptText(SAY_END, m_creature, player);
+            DoScriptText(SAY_END, m_creature, pPlayer);
             break;
         }
     }
@@ -116,8 +116,8 @@ struct TRINITY_DLL_DECL npc_willixAI : public npc_escortAI
     {
         if (PlayerGUID)
         {
-            if (Player* player = Unit::GetPlayer(PlayerGUID))
-                CAST_PLR(player)->FailQuest(QUEST_WILLIX_THE_IMPORTER);
+            if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
+                CAST_PLR(pPlayer)->FailQuest(QUEST_WILLIX_THE_IMPORTER);
         }
     }
 
@@ -127,12 +127,12 @@ struct TRINITY_DLL_DECL npc_willixAI : public npc_escortAI
     }
 };
 
-bool QuestAccept_npc_willix(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_willix(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_WILLIX_THE_IMPORTER)
     {
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
-        DoScriptText(SAY_READY, creature, player);
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
+        DoScriptText(SAY_READY, creature, pPlayer);
         creature->setFaction(113);
     }
 
@@ -165,7 +165,7 @@ struct TRINITY_DLL_DECL npc_deaths_head_ward_keeperAI : public ScriptedAI
 
         if (QuillboarChanneling_Timer < diff)
         {
-            if( m_creature->IsNonMeleeSpellCasted(false) )
+            if (m_creature->IsNonMeleeSpellCasted(false))
                 m_creature->InterruptNonMeleeSpells(true);
             DoCast(m_creature, SPELL_QUILLBOAR_CHANNELING);
             QuillboarChanneling_Timer = 1100;
diff --git a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp
index 60830068e01..b76684bff26 100644
--- a/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp
+++ b/src/bindings/scripts/scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp
@@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL boss_ayamissAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //If he is 70% start phase 2
diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp
index 2e2bb14a711..1f49751e08c 100644
--- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp
+++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_azshir_the_sleepless.cpp
@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_azshir_the_sleeplessAI : public ScriptedAI
             return;
 
         //If we are <50% hp cast Soul Siphon rank 1
-        if ( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 50 && !m_creature->IsNonMeleeSpellCasted(false))
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 50 && !m_creature->IsNonMeleeSpellCasted(false))
         {
             //SoulSiphon_Timer
             if (SoulSiphon_Timer < diff)
diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp
index 7aeb0571fdc..17c7f0e52b2 100644
--- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp
+++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp
@@ -167,7 +167,7 @@ struct TRINITY_DLL_DECL mob_wisp_invisAI : public ScriptedAI
 
     void SpellHit(Unit* caster, const SpellEntry *spell)
     {
-        if(spell->Id == SPELL_WISP_FLIGHT_PORT && Creaturetype == 4)
+        if (spell->Id == SPELL_WISP_FLIGHT_PORT && Creaturetype == 4)
             m_creature->SetDisplayId(2027);
     }
 
@@ -182,12 +182,12 @@ struct TRINITY_DLL_DECL mob_wisp_invisAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(delay)
+        if (delay)
         {
             if (delay <= diff)
             {
                 m_creature->RemoveAurasDueToSpell(SPELL_SMOKE);
-                if(spell2)
+                if (spell2)
                     DoCast(m_creature,spell2);
                 delay = 0;
             }else delay -= diff;
@@ -224,7 +224,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI
         DoScriptText(textEntry, m_creature, target);
         //DoCast(m_creature,SPELL_HEAD_SPEAKS,true);
         Creature *speaker = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,1000);
-        if(speaker)
+        if (speaker)
             speaker->CastSpell(speaker,SPELL_HEAD_SPEAKS,false);
         laugh += 3000;
     }
@@ -237,10 +237,10 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI
         switch(Phase)
         {
             case 1:
-                if(((m_creature->GetHealth() - damage)*100)/m_creature->GetMaxHealth() < 67)
+                if (((m_creature->GetHealth() - damage)*100)/m_creature->GetMaxHealth() < 67)
                     Disappear();break;
             case 2:
-                if(((m_creature->GetHealth() - damage)*100)/m_creature->GetMaxHealth() < 34)
+                if (((m_creature->GetHealth() - damage)*100)/m_creature->GetMaxHealth() < 34)
                     Disappear();break;
             case 3:
                 if (damage >= m_creature->GetHealth())
@@ -267,7 +267,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI
             if (Phase < 3) ++Phase;
             else Phase = 3;
             withbody = false;
-            if(!bodyGUID)
+            if (!bodyGUID)
                 bodyGUID = caster->GetGUID();
             m_creature->RemoveAllAuras();
             m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -296,7 +296,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI
                 DoPlaySoundToSet(m_creature, RandomLaugh[rand()%3]);
                 //DoCast(m_creature,SPELL_HEAD_SPEAKS,true); //this spell remove buff "head"
                 Creature *speaker = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,1000);
-                if(speaker)
+                if (speaker)
                     speaker->CastSpell(speaker,SPELL_HEAD_SPEAKS,false);
                 DoTextEmote("laughs",NULL);
             } else laugh -= diff;
@@ -322,7 +322,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
     boss_headless_horsemanAI(Creature *c) : ScriptedAI(c)
     {
         SpellEntry *confl = GET_SPELL(SPELL_CONFLAGRATION);
-        if(confl)
+        if (confl)
         {
             confl->EffectApplyAuraName[0] = SPELL_AURA_PERIODIC_DAMAGE_PERCENT;
             confl->EffectBasePoints[0] = 10;
@@ -330,11 +330,11 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
             confl->DmgMultiplier[0] = 1;
         }
 /*      SpellEntry *confl = GET_SPELL(SPELL_CONFLAGRATION);
-        if(confl)
+        if (confl)
             confl->EffectTriggerSpell[1] = 22587;
 
         SpellEntry *speed = GET_SPELL(22587);
-        if(speed)
+        if (speed)
         {
             speed->Effect[1] = SPELL_EFFECT_APPLY_AURA;
             speed->EffectApplyAuraName[1] = SPELL_AURA_MOD_CONFUSE;
@@ -345,7 +345,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
     ScriptedInstance *pInstance;
 
     uint64 headGUID;
-    uint64 playerGUID;
+    uint64 PlayerGUID;
 
     uint32 Phase;
     uint32 id;
@@ -385,7 +385,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
         DoCast(m_creature,SPELL_HEAD);
         if (headGUID){
             Unit* Head = Unit::GetUnit((*m_creature), headGUID);
-            if(Head){
+            if (Head){
                 Head->SetVisibility(VISIBILITY_OFF);
                 Head->setDeathState(JUST_DIED);
             }
@@ -423,12 +423,12 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
             m_creature->SetVisibility(VISIBILITY_ON);break;
         case 1: {
             Creature *smoke = m_creature->SummonCreature(HELPER,Spawn[1].x,Spawn[1].y,Spawn[1].z,0,TEMPSUMMON_TIMED_DESPAWN,20000);
-            if(smoke)
+            if (smoke)
                 CAST_AI(mob_wisp_invisAI, smoke->AI())->SetType(3);
             DoCast(m_creature,SPELL_RHYME_BIG);
             break;}
         case 6:
-            if(pInstance)
+            if (pInstance)
                 pInstance->SetData(GAMEOBJECT_PUMPKIN_SHRINE, 0);   //hide gameobject
             break;
         case 19:
@@ -439,7 +439,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
             wp_reached = false;
             m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             SaySound(SAY_ENTRANCE);
-            Unit *plr = Unit::GetUnit((*m_creature),playerGUID);
+            Unit *plr = Unit::GetUnit((*m_creature),PlayerGUID);
             if (plr)
                 DoStartMovement(plr);
             }
@@ -450,7 +450,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS);
         DoZoneInCombat();
     }
@@ -482,18 +482,18 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
 
     Player* SelectRandomPlayer(float range = 0.0f, bool checkLoS = true)
     {
-        Map *map = m_creature->GetMap();
-        if (!map->IsDungeon()) return NULL;
+        Map* pMap = m_creature->GetMap();
+        if (!pMap->IsDungeon()) return NULL;
 
-        Map::PlayerList const &PlayerList = map->GetPlayers();
+        Map::PlayerList const &PlayerList = pMap->GetPlayers();
         Map::PlayerList::const_iterator i;
-        if(PlayerList.isEmpty()) return NULL;
+        if (PlayerList.isEmpty()) return NULL;
 
         std::list<Player*> temp;
         std::list<Player*>::iterator j;
 
         for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
-            if((m_creature->IsWithinLOSInMap(i->getSource()) || !checkLoS) && m_creature->getVictim() != i->getSource() &&
+            if ((m_creature->IsWithinLOSInMap(i->getSource()) || !checkLoS) && m_creature->getVictim() != i->getSource() &&
                 m_creature->IsWithinDistInMap(i->getSource(), range) && i->getSource()->isAlive())
                 temp.push_back(i->getSource());
 
@@ -518,12 +518,12 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
         //m_creature->GetMotionMaster()->MoveIdle();    test
         SaySound(SAY_DEATH);
         Creature *flame = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,60000);
-        if(flame)
+        if (flame)
             flame->CastSpell(flame,SPELL_BODY_FLAME,false);
         Creature *wisp = DoSpawnCreature(WISP_INVIS,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,60000);
-        if(wisp)
+        if (wisp)
             CAST_AI(mob_wisp_invisAI, wisp->AI())->SetType(4);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_HORSEMAN_EVENT, DONE);
     }
 
@@ -549,7 +549,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
             for(itr = caster->getThreatManager().getThreatList().begin(); itr != caster->getThreatManager().getThreatList().end(); ++itr)
             {
                 Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid());
-                if(pUnit && pUnit->isAlive() && pUnit != caster)
+                if (pUnit && pUnit->isAlive() && pUnit != caster)
                     m_creature->AddThreat(pUnit,caster->getThreatManager().getThreat(pUnit));
             }
         }
@@ -597,11 +597,11 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
                             say_timer = 3000;
                             Player *plr = SelectRandomPlayer(100.0f,false);
                             if (count < 3)
-                                if(plr)
+                                if (plr)
                                     plr->Say(Text[count].text,0);
                             else {
                                 DoCast(m_creature,SPELL_RHYME_BIG);
-                                if(plr)
+                                if (plr)
                                 {
                                     plr->Say(Text[count].text,0);
                                     plr->HandleEmoteCommand(ANIM_EMOTE_SHOUT);
@@ -623,11 +623,11 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
                 }
                 break;
             case 1:
-                if(burned) break;
-                if(burn < diff)
+                if (burned) break;
+                if (burn < diff)
                 {
                     Creature *flame = m_creature->SummonCreature(HELPER,Spawn[0].x,Spawn[0].y,Spawn[0].z,0,TEMPSUMMON_TIMED_DESPAWN,17000);
-                    if(flame)
+                    if (flame)
                         CAST_AI(mob_wisp_invisAI, flame->AI())->SetType(2);
                     burned = true;
                 }else burn -= diff;
@@ -708,7 +708,7 @@ void mob_headAI::Disappear()
     if (bodyGUID)
     {
         Creature *body = Unit::GetCreature((*m_creature), bodyGUID);
-        if(body && body->isAlive())
+        if (body && body->isAlive())
         {
             withbody = true;
             m_creature->RemoveAllAuras();
@@ -737,7 +737,7 @@ struct TRINITY_DLL_DECL mob_pulsing_pumpkinAI : public ScriptedAI
         m_creature->GetMap()->CreatureRelocation(m_creature, x,y,z + 0.35f, 0.0f);
         Despawn();
         Creature *debuff = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,14500);
-        if(debuff)
+        if (debuff)
         {
             debuff->SetDisplayId(m_creature->GetDisplayId());
             debuff->CastSpell(debuff,SPELL_PUMPKIN_AURA_GREEN,false);
@@ -769,12 +769,12 @@ struct TRINITY_DLL_DECL mob_pulsing_pumpkinAI : public ScriptedAI
     {
         if (!debuffGUID) return;
         Unit *debuff = Unit::GetUnit((*m_creature),debuffGUID);
-        if(debuff)
+        if (debuff)
             debuff->SetVisibility(VISIBILITY_OFF);
             debuffGUID = 0;
     }
 
-    void JustDied(Unit *killer) {if(!sprouted) Despawn();}
+    void JustDied(Unit *killer) {if (!sprouted) Despawn();}
 
     void MoveInLineOfSight(Unit *who)
     {
@@ -782,7 +782,7 @@ struct TRINITY_DLL_DECL mob_pulsing_pumpkinAI : public ScriptedAI
             return;
 
         m_creature->AddThreat(who,0.0f);
-        if(sprouted)
+        if (sprouted)
             DoStartMovement(who);
     }
 
@@ -794,7 +794,7 @@ struct TRINITY_DLL_DECL mob_pulsing_pumpkinAI : public ScriptedAI
     }
 };
 
-bool GOHello_go_loosely_turned_soil(Player *plr, GameObject* soil)
+bool GOHello_go_loosely_turned_soil(Player* pPlayer, GameObject* soil)
 {
 /*  if (soil->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER && plr->getLevel() > 64)
     {
@@ -803,11 +803,11 @@ bool GOHello_go_loosely_turned_soil(Player *plr, GameObject* soil)
     }
     if (plr->GetQuestStatus(11405) == QUEST_STATUS_INCOMPLETE && plr->getLevel() > 64)
     { */
-        plr->AreaExploredOrEventHappens(11405);
+        pPlayer->AreaExploredOrEventHappens(11405);
         Creature *horseman = soil->SummonCreature(HH_MOUNTED,FlightPoint[20].x,FlightPoint[20].y,FlightPoint[20].z,0,TEMPSUMMON_MANUAL_DESPAWN,0);
-        if(horseman)
+        if (horseman)
         {
-            CAST_AI(boss_headless_horsemanAI, horseman->AI())->playerGUID = plr->GetGUID();
+            CAST_AI(boss_headless_horsemanAI, horseman->AI())->PlayerGUID = pPlayer->GetGUID();
             CAST_AI(boss_headless_horsemanAI, horseman->AI())->FlyMode();
         }
     //}
diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp
index 73f9fe764aa..e36370dfea9 100644
--- a/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp
+++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp
@@ -34,7 +34,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_scarlet_monastery : public ScriptedInstance
 {
-    instance_scarlet_monastery(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_scarlet_monastery(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint64 PumpkinShrineGUID;
     uint64 HorsemanGUID;
@@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL instance_scarlet_monastery : public ScriptedInstance
                 for(std::set<uint64>::iterator itr = HorsemanAdds.begin(); itr != HorsemanAdds.end(); ++itr)
                 {
                     Creature* add = instance->GetCreature(*itr);
-                    if(add && add->isAlive())
+                    if (add && add->isAlive())
                         add->DealDamage(add, add->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                 }
                 HorsemanAdds.clear();
@@ -141,9 +141,9 @@ struct TRINITY_DLL_DECL instance_scarlet_monastery : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_scarlet_monastery(Map* map)
+InstanceData* GetInstanceData_instance_scarlet_monastery(Map* pMap)
 {
-    return new instance_scarlet_monastery(map);
+    return new instance_scarlet_monastery(pMap);
 }
 
 void AddSC_instance_scarlet_monastery()
diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp
index a26a7652e74..5ccf476fa1d 100644
--- a/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp
+++ b/src/bindings/scripts/scripts/zone/scholomance/boss_darkmaster_gandling.cpp
@@ -110,15 +110,15 @@ struct TRINITY_DLL_DECL boss_darkmaster_gandlingAI : public ScriptedAI
 
         //Teleporting Random Target to one of the six pre boss rooms and spawn 3-4 skeletons near the gamer.
         //We will only telport if gandling has more than 3% of hp so teleported gamers can always loot.
-        if ( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() > 3 )
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() > 3)
         {
-            if(Teleport_Timer < diff)
+            if (Teleport_Timer < diff)
             {
                 Unit* target = NULL;
                 target = SelectUnit(SELECT_TARGET_RANDOM,0);
                 if (target && target->GetTypeId() == TYPEID_PLAYER)
                 {
-                    if(DoGetThreat(target))
+                    if (DoGetThreat(target))
                         DoModifyThreatPercent(target, -100);
 
                     switch(rand()%6)
@@ -126,79 +126,79 @@ struct TRINITY_DLL_DECL boss_darkmaster_gandlingAI : public ScriptedAI
                         case 0:
                             DoTeleportPlayer(target, 250.0696,0.3921,84.8408,3.149);
                             Summoned = m_creature->SummonCreature(16119,254.2325,0.3417,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,257.7133,4.0226,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,258.6702,-2.60656,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             break;
                         case 1:
                             DoTeleportPlayer(target, 181.4220,-91.9481,84.8410,1.608);
                             Summoned = m_creature->SummonCreature(16119,184.0519,-73.5649,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,179.5951,-73.7045,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,180.6452,-78.2143,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,283.2274,-78.1518,84.8407,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             break;
                         case 2:
                             DoTeleportPlayer(target, 95.1547,-1.8173,85.2289,0.043);
                             Summoned = m_creature->SummonCreature(16119,100.9404,-1.8016,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,101.3729,0.4882,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,101.4596,-4.4740,85.2289,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             break;
                         case 3:
                             DoTeleportPlayer(target, 250.0696,0.3921,72.6722,3.149);
                             Summoned = m_creature->SummonCreature(16119,240.34481,0.7368,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,240.3633,-2.9520,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,240.6702,3.34949,72.6722,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             break;
                         case 4:
                             DoTeleportPlayer(target, 181.4220,-91.9481,70.7734,1.608);
                             Summoned = m_creature->SummonCreature(16119,184.0519,-73.5649,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,179.5951,-73.7045,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,180.6452,-78.2143,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,283.2274,-78.1518,70.7734,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             break;
                         case 5:
                             DoTeleportPlayer(target, 106.1541,-1.8994,75.3663,0.043);
                             Summoned = m_creature->SummonCreature(16119,115.3945,-1.5555,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,257.7133,1.8066,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             Summoned = m_creature->SummonCreature(16119,258.6702,-5.1001,75.3663,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
-                            if(Summoned)
+                            if (Summoned)
                                 (Summoned->AI())->AttackStart(target);
                             break;
                     }
diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp
index f8676fc3c8b..d9486080b1b 100644
--- a/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/src/bindings/scripts/scripts/zone/scholomance/boss_doctor_theolen_krastinov.cpp
@@ -48,7 +48,7 @@ struct TRINITY_DLL_DECL boss_theolenkrastinovAI : public ScriptedAI
     void JustDied(Unit *killer)
     {
         ScriptedInstance *pInstance = (m_creature->GetInstanceData()) ? (m_creature->GetInstanceData()) : NULL;
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(DATA_DOCTORTHEOLENKRASTINOV_DEATH, 0);
 
@@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL boss_theolenkrastinovAI : public ScriptedAI
         }else Cleave_Timer -= diff;
 
         //Frenzy_Timer
-        if ( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 26 )
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 26)
         {
             if (Frenzy_Timer < diff)
             {
diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp
index 39b16785e43..dc7da4af19c 100644
--- a/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp
+++ b/src/bindings/scripts/scripts/zone/scholomance/boss_illucia_barov.cpp
@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_illuciabarovAI : public ScriptedAI
     void JustDied(Unit *killer)
     {
         ScriptedInstance *pInstance = (m_creature->GetInstanceData()) ? (m_creature->GetInstanceData()) : NULL;
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(DATA_LADYILLUCIABAROV_DEATH, 0);
 
diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp
index db070857f0d..914995a8777 100644
--- a/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp
+++ b/src/bindings/scripts/scripts/zone/scholomance/boss_instructor_malicia.cpp
@@ -56,7 +56,7 @@ struct TRINITY_DLL_DECL boss_instructormaliciaAI : public ScriptedAI
     void JustDied(Unit *killer)
     {
         ScriptedInstance *pInstance = (m_creature->GetInstanceData()) ? (m_creature->GetInstanceData()) : NULL;
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(DATA_INSTRUCTORMALICIA_DEATH, 0);
 
diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp
index f3fea613a0f..9ce096514df 100644
--- a/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp
+++ b/src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp
@@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI
         }
         Rand = 0;
         Summoned = DoSpawnCreature(11439, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
-        if(Summoned)
+        if (Summoned)
             (Summoned->AI())->AttackStart(victim);
     }
 
@@ -122,7 +122,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI
             for(uint8 i = 0; i < 10; ++i)
             {
                 target = SelectUnit(SELECT_TARGET_RANDOM,0);
-                if(target)
+                if (target)
                     SummonIllusions(target);
             }
             Invisible = true;
diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp
index 966fd3bf6ec..a96c24a8253 100644
--- a/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp
+++ b/src/bindings/scripts/scripts/zone/scholomance/boss_kormok.cpp
@@ -74,7 +74,7 @@ struct TRINITY_DLL_DECL boss_kormokAI : public ScriptedAI
         }
         Rand1 = 0;
         SummonedMinions = DoSpawnCreature(16119, Rand1X, Rand1Y, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
-        if(SummonedMinions)
+        if (SummonedMinions)
             (SummonedMinions->AI())->AttackStart(victim);
     }
 
@@ -95,7 +95,7 @@ struct TRINITY_DLL_DECL boss_kormokAI : public ScriptedAI
         }
         Rand2 = 0;
         SummonedMages = DoSpawnCreature(16120, Rand2X, Rand2Y, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000);
-        if(SummonedMages)
+        if (SummonedMages)
             (SummonedMages->AI())->AttackStart(victim);
     }
 
@@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL boss_kormokAI : public ScriptedAI
         }else Minion_Timer -= diff;
 
         //Summon 2 Bone Mages
-        if ( !Mages && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 26 )
+        if (!Mages && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 26)
         {
             //Cast
             SummonMages(m_creature->getVictim());
diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp
index ffaf56f1c45..27db649626f 100644
--- a/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp
+++ b/src/bindings/scripts/scripts/zone/scholomance/boss_lord_alexei_barov.cpp
@@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_lordalexeibarovAI : public ScriptedAI
     void JustDied(Unit *killer)
     {
         ScriptedInstance *pInstance = (m_creature->GetInstanceData()) ? (m_creature->GetInstanceData()) : NULL;
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(DATA_LORDALEXEIBAROV_DEATH, 0);
 
diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp
index 1afa0c91fa6..b37be7c3129 100644
--- a/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp
+++ b/src/bindings/scripts/scripts/zone/scholomance/boss_lorekeeper_polkelt.cpp
@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_lorekeeperpolkeltAI : public ScriptedAI
     void JustDied(Unit *killer)
     {
         ScriptedInstance *pInstance = (m_creature->GetInstanceData()) ? (m_creature->GetInstanceData()) : NULL;
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(DATA_LOREKEEPERPOLKELT_DEATH, 0);
 
diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp
index 6be34592529..31eca51391c 100644
--- a/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp
+++ b/src/bindings/scripts/scripts/zone/scholomance/boss_the_ravenian.cpp
@@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL boss_theravenianAI : public ScriptedAI
     void JustDied(Unit *killer)
     {
         ScriptedInstance *pInstance = (m_creature->GetInstanceData()) ? (m_creature->GetInstanceData()) : NULL;
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(DATA_THERAVENIAN_DEATH, 0);
 
diff --git a/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp b/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp
index 55a50724294..d82c749fbad 100644
--- a/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp
+++ b/src/bindings/scripts/scripts/zone/scholomance/boss_vectus.cpp
@@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL boss_vectusAI : public ScriptedAI
         }else BlastWave_Timer -= diff;
 
         //Frenzy_Timer
-        if ( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 25 )
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 25)
         {
             if (Frenzy_Timer < diff)
             {
diff --git a/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp b/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp
index 210959a8478..a31b172a76c 100644
--- a/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp
+++ b/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp
@@ -37,7 +37,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_scholomance : public ScriptedInstance
 {
-    instance_scholomance(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_scholomance(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     //Lord Alexei Barov, Doctor Theolen Krastinov, The Ravenian, Lorekeeper Polkelt, Instructor Malicia and the Lady Illucia Barov.
     bool IsBossDied[6];
@@ -131,9 +131,9 @@ struct TRINITY_DLL_DECL instance_scholomance : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_scholomance(Map* map)
+InstanceData* GetInstanceData_instance_scholomance(Map* pMap)
 {
-    return new instance_scholomance(map);
+    return new instance_scholomance(pMap);
 }
 
 void AddSC_instance_scholomance()
diff --git a/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp b/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp
index b6125770523..f82e5b362a7 100644
--- a/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp
+++ b/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp
@@ -33,34 +33,34 @@ EndContentData */
 ## npc_kalaran_windblade
 ######*/
 
-bool GossipHello_npc_kalaran_windblade(Player *player, Creature *_Creature)
+bool GossipHello_npc_kalaran_windblade(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(3441) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me what drives this vengance?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(3441) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me what drives this vengance?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_kalaran_windblade(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_kalaran_windblade(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Continue please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->SEND_GOSSIP_MENU(1954, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Continue please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(1954, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let me confer with my colleagues", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(1955, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let me confer with my colleagues", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(1955, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(3441);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(3441);
             break;
     }
     return true;
@@ -70,25 +70,25 @@ bool GossipSelect_npc_kalaran_windblade(Player *player, Creature *_Creature, uin
 ## npc_lothos_riftwaker
 ######*/
 
-bool GossipHello_npc_lothos_riftwaker(Player *player, Creature *_Creature)
+bool GossipHello_npc_lothos_riftwaker(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestRewardStatus(7487) || player->GetQuestRewardStatus(7848))
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport me to the Molten Core", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    if (pPlayer->GetQuestRewardStatus(7487) || pPlayer->GetQuestRewardStatus(7848))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport me to the Molten Core", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_lothos_riftwaker(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_lothos_riftwaker(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF + 1)
     {
-        player->CLOSE_GOSSIP_MENU();
-        player->TeleportTo(409, 1096, -467, -104.6, 3.64);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->TeleportTo(409, 1096, -467, -104.6, 3.64);
     }
 
     return true;
@@ -98,34 +98,34 @@ bool GossipSelect_npc_lothos_riftwaker(Player *player, Creature *_Creature, uint
 ## npc_zamael_lunthistle
 ######*/
 
-bool GossipHello_npc_zamael_lunthistle(Player *player, Creature *_Creature)
+bool GossipHello_npc_zamael_lunthistle(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(3377) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me your story", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(3377) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me your story", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(1920, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(1920, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_zamael_lunthistle(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_zamael_lunthistle(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Please continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->SEND_GOSSIP_MENU(1921, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Please continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(1921, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Goodbye", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(1922, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Goodbye", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(1922, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(3377);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(3377);
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp
index a5f8c84d918..a89e842f555 100644
--- a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp
+++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp
@@ -41,7 +41,7 @@ enum
 
 struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance
 {
-    instance_shadowfang_keep(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_shadowfang_keep(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounter[ENCOUNTERS];
     std::string str_data;
@@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance
         switch(type)
         {
             case TYPE_FREE_NPC:
-                if(data == DONE)
+                if (data == DONE)
                     DoUseDoorOrButton(DoorCourtyardGUID);
                 Encounter[0] = data;
                 break;
@@ -124,12 +124,12 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance
                 Encounter[1] = data;
                 break;
             case TYPE_FENRUS:
-                if(data == DONE)
+                if (data == DONE)
                     DoUseDoorOrButton(DoorSorcererGUID);
                 Encounter[2] = data;
                 break;
             case TYPE_NANDOS:
-                if(data == DONE)
+                if (data == DONE)
                     DoUseDoorOrButton(DoorArugalGUID);
                 Encounter[3] = data;
                 break;
@@ -193,9 +193,9 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_shadowfang_keep(Map* map)
+InstanceData* GetInstanceData_instance_shadowfang_keep(Map* pMap)
 {
-    return new instance_shadowfang_keep(map);
+    return new instance_shadowfang_keep(pMap);
 }
 
 void AddSC_instance_shadowfang_keep()
diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp
index bbc6facb169..d3c26f6345c 100644
--- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp
+++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/boss_doomwalker.cpp
@@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI
     {
         Victim->CastSpell(Victim,SPELL_MARK_DEATH,0);
 
-        if(rand()%5)
+        if (rand()%5)
             return;
 
         switch(rand()%3)
@@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI
         //Spell Enrage, when hp <= 20% gain enrage
         if (((m_creature->GetHealth()*100)/ m_creature->GetMaxHealth()) <= 20)
         {
-            if(Enrage_Timer < diff)
+            if (Enrage_Timer < diff)
             {
                 DoCast(m_creature,SPELL_ENRAGE);
                 Enrage_Timer = 6000;
diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp
index e6875d2dcc5..ea3a5a976f8 100644
--- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp
+++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp
@@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL mob_mature_netherwing_drakeAI : public ScriptedAI
         return;
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         if (CastTimer < diff)
@@ -197,7 +197,7 @@ struct TRINITY_DLL_DECL mob_enslaved_netherwing_drakeAI : public ScriptedAI
 
     void Reset()
     {
-        if(!Tapped)
+        if (!Tapped)
             m_creature->setFaction(FACTION_DEFAULT);
 
         FlyTimer = 10000;
@@ -209,10 +209,10 @@ struct TRINITY_DLL_DECL mob_enslaved_netherwing_drakeAI : public ScriptedAI
 
     void SpellHit(Unit* caster, const SpellEntry* spell)
     {
-        if(!caster)
+        if (!caster)
             return;
 
-        if(caster->GetTypeId() == TYPEID_PLAYER && spell->Id == SPELL_HIT_FORCE_OF_NELTHARAKU && !Tapped)
+        if (caster->GetTypeId() == TYPEID_PLAYER && spell->Id == SPELL_HIT_FORCE_OF_NELTHARAKU && !Tapped)
         {
             Tapped = true;
             PlayerGUID = caster->GetGUID();
@@ -222,29 +222,29 @@ struct TRINITY_DLL_DECL mob_enslaved_netherwing_drakeAI : public ScriptedAI
 
             Unit* Dragonmaw = me->FindNearestCreature(CREATURE_DRAGONMAW_SUBJUGATOR, 50);
 
-            if(Dragonmaw)
+            if (Dragonmaw)
             {
                 m_creature->AddThreat(Dragonmaw, 100000.0f);
                 AttackStart(Dragonmaw);
             }
 
             HostilReference* ref = m_creature->getThreatManager().getOnlineContainer().getReferenceByTarget(caster);
-            if(ref)
+            if (ref)
                 ref->removeReference();
         }
     }
 
     void MovementInform(uint32 type, uint32 id)
     {
-        if(type != POINT_MOTION_TYPE)
+        if (type != POINT_MOTION_TYPE)
             return;
 
-        if(id == 1)
+        if (id == 1)
         {
-            if(PlayerGUID)
+            if (PlayerGUID)
             {
                 Unit* plr = Unit::GetUnit((*m_creature), PlayerGUID);
-                if(plr)
+                if (plr)
                     DoCast(plr, SPELL_FORCE_OF_NELTHARAKU, true);
 
                 PlayerGUID = 0;
@@ -258,16 +258,16 @@ struct TRINITY_DLL_DECL mob_enslaved_netherwing_drakeAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
         {
-            if(Tapped)
-                if(FlyTimer < diff)
+            if (Tapped)
+                if (FlyTimer < diff)
             {
                 Tapped = false;
-                if(PlayerGUID)
+                if (PlayerGUID)
                 {
                     Player* plr = Unit::GetPlayer(PlayerGUID);
-                    if(plr && plr->GetQuestStatus(10854) == QUEST_STATUS_INCOMPLETE)
+                    if (plr && plr->GetQuestStatus(10854) == QUEST_STATUS_INCOMPLETE)
                     {
                         DoCast(plr, SPELL_FORCE_OF_NELTHARAKU, true);
                         /*
@@ -281,7 +281,7 @@ struct TRINITY_DLL_DECL mob_enslaved_netherwing_drakeAI : public ScriptedAI
                         float dx, dy, dz;
 
                         Unit* EscapeDummy = me->FindNearestCreature(CREATURE_ESCAPE_DUMMY, 30);
-                        if(EscapeDummy)
+                        if (EscapeDummy)
                             EscapeDummy->GetPosition(dx, dy, dz);
                         else
                         {
@@ -329,10 +329,10 @@ struct TRINITY_DLL_DECL mob_dragonmaw_peonAI : public ScriptedAI
 
     void SpellHit(Unit* caster, const SpellEntry* spell)
     {
-        if(!caster)
+        if (!caster)
             return;
 
-        if(caster->GetTypeId() == TYPEID_PLAYER && spell->Id == 40468 && !Tapped)
+        if (caster->GetTypeId() == TYPEID_PLAYER && spell->Id == 40468 && !Tapped)
         {
             PlayerGUID = caster->GetGUID();
 
@@ -347,10 +347,10 @@ struct TRINITY_DLL_DECL mob_dragonmaw_peonAI : public ScriptedAI
 
     void MovementInform(uint32 type, uint32 id)
     {
-        if(type != POINT_MOTION_TYPE)
+        if (type != POINT_MOTION_TYPE)
             return;
 
-        if(id)
+        if (id)
         {
             m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_EAT);
             PoisonTimer = 15000;
@@ -359,13 +359,13 @@ struct TRINITY_DLL_DECL mob_dragonmaw_peonAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(PoisonTimer)
-            if(PoisonTimer <= diff)
+        if (PoisonTimer)
+            if (PoisonTimer <= diff)
         {
-            if(PlayerGUID)
+            if (PlayerGUID)
             {
                 Player* plr = Unit::GetPlayer(PlayerGUID);
-                if(plr && plr->GetQuestStatus(11020) == QUEST_STATUS_INCOMPLETE)
+                if (plr && plr->GetQuestStatus(11020) == QUEST_STATUS_INCOMPLETE)
                     plr->KilledMonsterCredit(23209, m_creature->GetGUID());
             }
             PoisonTimer = 0;
@@ -383,20 +383,20 @@ CreatureAI* GetAI_mob_dragonmaw_peon(Creature* _Creature)
 ## npc_drake_dealer_hurlunk
 ######*/
 
-bool GossipHello_npc_drake_dealer_hurlunk(Player *player, Creature *_Creature)
+bool GossipHello_npc_drake_dealer_hurlunk(Player* pPlayer, Creature *_Creature)
 {
-    if (_Creature->isVendor() && player->GetReputationRank(1015) == REP_EXALTED)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+    if (_Creature->isVendor() && pPlayer->GetReputationRank(1015) == REP_EXALTED)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_drake_dealer_hurlunk(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_drake_dealer_hurlunk(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_TRADE)
-        player->SEND_VENDORLIST( _Creature->GetGUID() );
+        pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
 
     return true;
 }
@@ -408,38 +408,38 @@ bool GossipSelect_npc_drake_dealer_hurlunk(Player *player, Creature *_Creature,
 #define GOSSIP_HSK1 "Take Flanis's Pack"
 #define GOSSIP_HSK2 "Take Kagrosh's Pack"
 
-bool GossipHello_npcs_flanis_swiftwing_and_kagrosh(Player *player, Creature *_Creature)
+bool GossipHello_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature *_Creature)
 {
-    if (player->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(30658,1,true))
-        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HSK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-    if (player->GetQuestStatus(10601) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(30659,1,true))
-        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HSK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+    if (pPlayer->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30658,1,true))
+        pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(10601) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30659,1,true))
+        pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npcs_flanis_swiftwing_and_kagrosh(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
         ItemPosCountVec dest;
-        uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, 30658, 1, false);
-        if( msg == EQUIP_ERR_OK )
+        uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 30658, 1, false);
+        if (msg == EQUIP_ERR_OK)
         {
-            player->StoreNewItem( dest, 30658, 1, true);
-            player->PlayerTalkClass->ClearMenus();
+            pPlayer->StoreNewItem(dest, 30658, 1, true);
+            pPlayer->PlayerTalkClass->ClearMenus();
         }
     }
     if (action == GOSSIP_ACTION_INFO_DEF+2)
     {
         ItemPosCountVec dest;
-        uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, 30659, 1, false);
-        if( msg == EQUIP_ERR_OK )
+        uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 30659, 1, false);
+        if (msg == EQUIP_ERR_OK)
         {
-            player->StoreNewItem( dest, 30659, 1, true);
-            player->PlayerTalkClass->ClearMenus();
+            pPlayer->StoreNewItem(dest, 30659, 1, true);
+            pPlayer->PlayerTalkClass->ClearMenus();
         }
     }
     return true;
@@ -458,49 +458,49 @@ bool GossipSelect_npcs_flanis_swiftwing_and_kagrosh(Player *player, Creature *_C
 #define GOSSIP_SMO4 "Who are these bidders?"
 #define GOSSIP_SMO5 "Well... yes."
 
-bool GossipHello_npc_murkblood_overseer(Player *player, Creature *_Creature)
+bool GossipHello_npc_murkblood_overseer(Player* pPlayer, Creature *_Creature)
 {
-    if (player->GetQuestStatus(QUEST_11082) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HMO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(QUEST_11082) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HMO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_murkblood_overseer(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_murkblood_overseer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
                                                             //correct id not known
-            player->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
                                                             //correct id not known
-            player->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
                                                             //correct id not known
-            player->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
                                                             //correct id not known
-            player->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
                                                             //correct id not known
-            player->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+6:
                                                             //correct id not known
-            player->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
-            _Creature->CastSpell(player,41121,false);
-            player->AreaExploredOrEventHappens(QUEST_11082);
+            pPlayer->SEND_GOSSIP_MENU(10940, _Creature->GetGUID());
+            _Creature->CastSpell(pPlayer,41121,false);
+            pPlayer->AreaExploredOrEventHappens(QUEST_11082);
             break;
     }
     return true;
@@ -515,38 +515,38 @@ bool GossipSelect_npc_murkblood_overseer(Player *player, Creature *_Creature, ui
 #define GOSSIP_SN2 "Your mate?"
 #define GOSSIP_SN3 "I have battled many beasts, dragon. I will help you."
 
-bool GossipHello_npc_neltharaku(Player *player, Creature *_Creature)
+bool GossipHello_npc_neltharaku(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(10814) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(10814) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(10613, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(10613, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_neltharaku(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_neltharaku(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->SEND_GOSSIP_MENU(10614, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_SN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(10614, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-            player->SEND_GOSSIP_MENU(10615, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_SN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+            pPlayer->SEND_GOSSIP_MENU(10615, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
-            player->SEND_GOSSIP_MENU(10616, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_SN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+            pPlayer->SEND_GOSSIP_MENU(10616, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(10814);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(10814);
             break;
     }
     return true;
@@ -564,57 +564,57 @@ bool GossipSelect_npc_neltharaku(Player *player, Creature *_Creature, uint32 sen
 #define GOSSIP_ORONOK6 "So what of the cipher now? And your boys?"
 #define GOSSIP_ORONOK7 "I will find your boys and the cipher, Oronok."
 
-bool GossipHello_npc_oronok_tornheart(Player *player, Creature *_Creature)
+bool GossipHello_npc_oronok_tornheart(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
     if (_Creature->isVendor())
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
 
-    if (player->GetQuestStatus(10519) == QUEST_STATUS_INCOMPLETE)
+    if (pPlayer->GetQuestStatus(10519) == QUEST_STATUS_INCOMPLETE)
     {
-        player->ADD_GOSSIP_ITEM( 0, GOSSIP_ORONOK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
-        player->SEND_GOSSIP_MENU(10312, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        pPlayer->SEND_GOSSIP_MENU(10312, _Creature->GetGUID());
     }else
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_oronok_tornheart(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_oronok_tornheart(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_TRADE:
-            player->SEND_VENDORLIST( _Creature->GetGUID() );
+            pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM( 0, GOSSIP_ORONOK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-            player->SEND_GOSSIP_MENU(10313, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+            pPlayer->SEND_GOSSIP_MENU(10313, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM( 0, GOSSIP_ORONOK3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->SEND_GOSSIP_MENU(10314, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(10314, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM( 0, GOSSIP_ORONOK4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-            player->SEND_GOSSIP_MENU(10315, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+            pPlayer->SEND_GOSSIP_MENU(10315, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM( 0, GOSSIP_ORONOK5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
-            player->SEND_GOSSIP_MENU(10316, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+            pPlayer->SEND_GOSSIP_MENU(10316, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM( 0, GOSSIP_ORONOK6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-            player->SEND_GOSSIP_MENU(10317, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            pPlayer->SEND_GOSSIP_MENU(10317, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->ADD_GOSSIP_ITEM( 0, GOSSIP_ORONOK7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
-            player->SEND_GOSSIP_MENU(10318, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_ORONOK7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
+            pPlayer->SEND_GOSSIP_MENU(10318, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+6:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(10519);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(10519);
             break;
     }
     return true;
@@ -631,10 +631,10 @@ enum
     TAXI_PATH_ID            = 649
 };
 
-bool QuestAccept_npc_karynaku(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_karynaku(Player* pPlayer, Creature* creature, Quest const* quest)
 {
-    if(quest->GetQuestId() == QUEST_ALLY_OF_NETHER)
-        player->ActivateTaxiPathTo(TAXI_PATH_ID);        //player->ActivateTaxiPathTo(649);
+    if (quest->GetQuestId() == QUEST_ALLY_OF_NETHER)
+        pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID);        //pPlayer->ActivateTaxiPathTo(649);
 
     return true;
 }
@@ -703,16 +703,16 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI
         m_creature->SetUInt32Value(UNIT_NPC_FLAGS, 0);
         m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0);
         Unit* Illidan = m_creature->SummonCreature(C_ILLIDAN, -5107.83, 602.584, 85.2393, 4.92598, TEMPSUMMON_CORPSE_DESPAWN, 0);
-        if(Illidan)
+        if (Illidan)
         {
             IllidanGUID = Illidan->GetGUID();
             Illidan->SetVisibility(VISIBILITY_OFF);
         }
-        if(PlayerGUID)
+        if (PlayerGUID)
         {
-            Player* player = Unit::GetPlayer(PlayerGUID);
-            if(player)
-                DoScriptText(OVERLORD_SAY_1, m_creature, player);
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (pPlayer)
+                DoScriptText(OVERLORD_SAY_1, m_creature, pPlayer);
         }
         ConversationTimer = 4200;
         Step = 0;
@@ -725,7 +725,7 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI
 
         Unit* Illi = Unit::GetUnit((*m_creature), IllidanGUID);
 
-        if(!plr || !Illi)
+        if (!plr || !Illi)
         {
             EnterEvadeMode();
             return 0;
@@ -780,7 +780,7 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI
         case 24: m_creature->SetUInt64Value(UNIT_FIELD_TARGET, PlayerGUID); return 5000; break;
         case 25: DoScriptText(OVERLORD_SAY_6, m_creature); return 2000; break;
         case 26:
-            if(plr)
+            if (plr)
                 CAST_PLR(plr)->GroupEventHappens(QUEST_LORD_ILLIDAN_STORMRAGE, m_creature);
             return 6000; break;
         case 27:
@@ -798,7 +798,7 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI
         case 29:
             {
             Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
-            if(Yarzill)
+            if (Yarzill)
                 DoScriptText(YARZILL_THE_MERC_SAY, Yarzill, plr);
             return 5000; }break;
         case 30:
@@ -822,12 +822,12 @@ struct TRINITY_DLL_DECL npc_overlord_morghorAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!ConversationTimer)
+        if (!ConversationTimer)
             return;
 
-        if(ConversationTimer <= diff)
+        if (ConversationTimer <= diff)
         {
-            if(Event && IllidanGUID && PlayerGUID)
+            if (Event && IllidanGUID && PlayerGUID)
             {
                 ConversationTimer = NextStep(++Step);
             }
@@ -840,11 +840,11 @@ CreatureAI* GetAI_npc_overlord_morghorAI(Creature *_Creature)
 return new npc_overlord_morghorAI(_Creature);
 }
 
-bool QuestAccept_npc_overlord_morghor(Player *player, Creature *_Creature, const Quest *_Quest )
+bool QuestAccept_npc_overlord_morghor(Player* pPlayer, Creature *_Creature, const Quest *_Quest)
 {
-    if(_Quest->GetQuestId() == QUEST_LORD_ILLIDAN_STORMRAGE)
+    if (_Quest->GetQuestId() == QUEST_LORD_ILLIDAN_STORMRAGE)
     {
-        CAST_AI(npc_overlord_morghorAI, _Creature->AI())->PlayerGUID = player->GetGUID();
+        CAST_AI(npc_overlord_morghorAI, _Creature->AI())->PlayerGUID = pPlayer->GetGUID();
         CAST_AI(npc_overlord_morghorAI, _Creature->AI())->StartEvent();
         return true;
     }
@@ -879,11 +879,11 @@ struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI
 
     void EnterCombat(Unit *who)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if(who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_COILSKAR_ASSASSIN)
-            DoScriptText(SAY_AGGRO2, m_creature, player);
-        else DoScriptText(SAY_AGGRO1, m_creature, player);
+        if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_COILSKAR_ASSASSIN)
+            DoScriptText(SAY_AGGRO2, m_creature, pPlayer);
+        else DoScriptText(SAY_AGGRO1, m_creature, pPlayer);
     }
 
     void Reset()
@@ -894,68 +894,68 @@ struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!player)
+        if (!pPlayer)
             return;
 
         switch(i)
         {
-               case 0: DoScriptText(SAY_START, m_creature, player); break;
-               case 13: DoScriptText(SAY_PROGRESS1, m_creature, player);
+               case 0: DoScriptText(SAY_START, m_creature, pPlayer); break;
+               case 13: DoScriptText(SAY_PROGRESS1, m_creature, pPlayer);
                    SummonAssassin();
                    break;
                case 14: SummonAssassin(); break;
-               case 15: DoScriptText(SAY_PROGRESS3, m_creature, player); break;
+               case 15: DoScriptText(SAY_PROGRESS3, m_creature, pPlayer); break;
                case 19:
                    switch(rand()%3)
                    {
-                   case 0: DoScriptText(SAY_PROGRESS2, m_creature, player); break;
-                   case 1: DoScriptText(SAY_PROGRESS4, m_creature, player); break;
-                   case 2: DoScriptText(SAY_PROGRESS5, m_creature, player); break;
+                   case 0: DoScriptText(SAY_PROGRESS2, m_creature, pPlayer); break;
+                   case 1: DoScriptText(SAY_PROGRESS4, m_creature, pPlayer); break;
+                   case 2: DoScriptText(SAY_PROGRESS5, m_creature, pPlayer); break;
                    }
                    break;
                case 20: SummonAssassin(); break;
                case 26:
                    switch(rand()%3)
                    {
-                   case 0: DoScriptText(SAY_PROGRESS2, m_creature, player); break;
-                   case 1: DoScriptText(SAY_PROGRESS4, m_creature, player); break;
-                   case 2: DoScriptText(SAY_PROGRESS5, m_creature, player); break;
+                   case 0: DoScriptText(SAY_PROGRESS2, m_creature, pPlayer); break;
+                   case 1: DoScriptText(SAY_PROGRESS4, m_creature, pPlayer); break;
+                   case 2: DoScriptText(SAY_PROGRESS5, m_creature, pPlayer); break;
                    }
                    break;
                case 27: SummonAssassin(); break;
                case 33:
                    switch(rand()%3)
                    {
-                   case 0: DoScriptText(SAY_PROGRESS2, m_creature, player); break;
-                   case 1: DoScriptText(SAY_PROGRESS4, m_creature, player); break;
-                   case 2: DoScriptText(SAY_PROGRESS5, m_creature, player); break;
+                   case 0: DoScriptText(SAY_PROGRESS2, m_creature, pPlayer); break;
+                   case 1: DoScriptText(SAY_PROGRESS4, m_creature, pPlayer); break;
+                   case 2: DoScriptText(SAY_PROGRESS5, m_creature, pPlayer); break;
                    }
                    break;
                case 34: SummonAssassin(); break;
                case 37:
                    switch(rand()%3)
                    {
-                   case 0: DoScriptText(SAY_PROGRESS2, m_creature, player); break;
-                   case 1: DoScriptText(SAY_PROGRESS4, m_creature, player); break;
-                   case 2: DoScriptText(SAY_PROGRESS5, m_creature, player); break;
+                   case 0: DoScriptText(SAY_PROGRESS2, m_creature, pPlayer); break;
+                   case 1: DoScriptText(SAY_PROGRESS4, m_creature, pPlayer); break;
+                   case 2: DoScriptText(SAY_PROGRESS5, m_creature, pPlayer); break;
                    }
                    break;
                case 38: SummonAssassin(); break;
-               case 39: DoScriptText(SAY_PROGRESS6, m_creature, player); break;
+               case 39: DoScriptText(SAY_PROGRESS6, m_creature, pPlayer); break;
                case 43:
                    switch(rand()%3)
                    {
-                   case 0: DoScriptText(SAY_PROGRESS2, m_creature, player); break;
-                   case 1: DoScriptText(SAY_PROGRESS4, m_creature, player); break;
-                   case 2: DoScriptText(SAY_PROGRESS5, m_creature, player); break;
+                   case 0: DoScriptText(SAY_PROGRESS2, m_creature, pPlayer); break;
+                   case 1: DoScriptText(SAY_PROGRESS4, m_creature, pPlayer); break;
+                   case 2: DoScriptText(SAY_PROGRESS5, m_creature, pPlayer); break;
                    }
                    break;
                case 44: SummonAssassin(); break;
                case 50:
-                   DoScriptText(SAY_END, m_creature, player);
-                   CAST_PLR(player)->GroupEventHappens(QUEST_ESCAPE_FROM_COILSKAR_CISTERN, m_creature);
+                   DoScriptText(SAY_END, m_creature, pPlayer);
+                   CAST_PLR(pPlayer)->GroupEventHappens(QUEST_ESCAPE_FROM_COILSKAR_CISTERN, m_creature);
                    Completed = true;
                    break;
                }
@@ -963,15 +963,15 @@ struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI
 
        void SummonAssassin()
        {
-           Player* player = Unit::GetPlayer(PlayerGUID);
+           Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
            Unit* CoilskarAssassin = m_creature->SummonCreature(NPC_COILSKAR_ASSASSIN, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), m_creature->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 0);
-           if( CoilskarAssassin )
+           if (CoilskarAssassin)
            {
                switch(rand()%2)
                {
-               case 0: DoScriptText(ASSASSIN_SAY_AGGRO1, CoilskarAssassin, player); break;
-               case 1: DoScriptText(ASSASSIN_SAY_AGGRO2, CoilskarAssassin, player); break;
+               case 0: DoScriptText(ASSASSIN_SAY_AGGRO1, CoilskarAssassin, pPlayer); break;
+               case 1: DoScriptText(ASSASSIN_SAY_AGGRO2, CoilskarAssassin, pPlayer); break;
                }
                CAST_CRE(CoilskarAssassin)->AI()->AttackStart(m_creature);
            }
@@ -982,9 +982,9 @@ struct TRINITY_DLL_DECL npc_earthmender_wildaAI : public npc_escortAI
        {
            if (PlayerGUID && !Completed)
            {
-               Player* player = Unit::GetPlayer(PlayerGUID);
-               if (player)
-                   CAST_PLR(player)->FailQuest(QUEST_ESCAPE_FROM_COILSKAR_CISTERN);
+               Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+               if (pPlayer)
+                   CAST_PLR(pPlayer)->FailQuest(QUEST_ESCAPE_FROM_COILSKAR_CISTERN);
            }
        }
 
@@ -1054,12 +1054,12 @@ CreatureAI* GetAI_npc_earthmender_wildaAI(Creature *_Creature)
        return earthmender_wildaAI;
 }
 
-bool QuestAccept_npc_earthmender_wilda(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_earthmender_wilda(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_ESCAPE_FROM_COILSKAR_CISTERN)
     {
         creature->setFaction(113);
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
     }
     return true;
 }
@@ -1183,22 +1183,22 @@ struct TRINITY_DLL_DECL mob_illidari_spawnAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(!Timers)
+        if (!Timers)
         {
-            if(m_creature->GetEntry() == 22075)//Illidari Soldier
+            if (m_creature->GetEntry() == 22075)//Illidari Soldier
             {
                 SpellTimer1 = SpawnCast[0].Timer1 + (rand()%4 * 1000);
             }
-            if(m_creature->GetEntry() == 22074)//Illidari Mind Breaker
+            if (m_creature->GetEntry() == 22074)//Illidari Mind Breaker
             {
                 SpellTimer1 = SpawnCast[1].Timer1 + (rand()%10 * 1000);
                 SpellTimer2 = SpawnCast[2].Timer1 + (rand()%4 * 1000);
                 SpellTimer3 = SpawnCast[3].Timer1 + (rand()%4 * 1000);
             }
-            if(m_creature->GetEntry() == 19797)// Illidari Highlord
+            if (m_creature->GetEntry() == 19797)// Illidari Highlord
             {
                 SpellTimer1 = SpawnCast[4].Timer1 + (rand()%4 * 1000);
                 SpellTimer2 = SpawnCast[5].Timer1 + (rand()%4 * 1000);
@@ -1206,22 +1206,22 @@ struct TRINITY_DLL_DECL mob_illidari_spawnAI : public ScriptedAI
             Timers = true;
         }
         //Illidari Soldier
-        if(m_creature->GetEntry() == 22075)
+        if (m_creature->GetEntry() == 22075)
         {
-            if(SpellTimer1 < diff)
+            if (SpellTimer1 < diff)
             {
                 DoCast(m_creature->getVictim(), SpawnCast[0].SpellId);//Spellbreaker
                 SpellTimer1 = SpawnCast[0].Timer2 + (rand()%5 * 1000);
             }else SpellTimer1 -= diff;
         }
         //Illidari Mind Breaker
-        if(m_creature->GetEntry() == 22074)
+        if (m_creature->GetEntry() == 22074)
         {
-            if(SpellTimer1 < diff)
+            if (SpellTimer1 < diff)
             {
-                if(Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
+                if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 {
-                    if(target->GetTypeId() == TYPEID_PLAYER)
+                    if (target->GetTypeId() == TYPEID_PLAYER)
                     {
                         DoCast(target, SpawnCast[1].SpellId); //Focused Bursts
                         SpellTimer1 = SpawnCast[1].Timer2 + (rand()%5 * 1000);
@@ -1229,28 +1229,28 @@ struct TRINITY_DLL_DECL mob_illidari_spawnAI : public ScriptedAI
                 }
             }else SpellTimer1 -= diff;
 
-            if(SpellTimer2 < diff)
+            if (SpellTimer2 < diff)
             {
                 DoCast(m_creature->getVictim(), SpawnCast[2].SpellId);//Psychic Scream
                 SpellTimer2 = SpawnCast[2].Timer2 + (rand()%13 * 1000);
             }else SpellTimer2 -= diff;
 
-            if(SpellTimer3 < diff)
+            if (SpellTimer3 < diff)
             {
                 DoCast(m_creature->getVictim(), SpawnCast[3].SpellId);//Mind Blast
                 SpellTimer3 = SpawnCast[3].Timer2 + (rand()%8 * 1000);
             }else SpellTimer3 -= diff;
         }
         //Illidari Highlord
-        if(m_creature->GetEntry() == 19797)
+        if (m_creature->GetEntry() == 19797)
         {
-            if(SpellTimer1 < diff)
+            if (SpellTimer1 < diff)
             {
                 DoCast(m_creature->getVictim(), SpawnCast[4].SpellId);//Curse Of Flames
                 SpellTimer1 = SpawnCast[4].Timer2 + (rand()%10 * 1000);
             }else SpellTimer1 -= diff;
 
-            if(SpellTimer2 < diff)
+            if (SpellTimer2 < diff)
             {
                 DoCast(m_creature->getVictim(), SpawnCast[5].SpellId);//Flamestrike
                 SpellTimer2 = SpawnCast[5].Timer2 + (rand()%7 * 13000);
@@ -1297,15 +1297,15 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI
     {
         Creature* pCreature = m_creature;
 
-        if(TorlothAnim[AnimationCount].Creature == 1)
+        if (TorlothAnim[AnimationCount].Creature == 1)
         {
             pCreature = (Unit::GetCreature(*m_creature, LordIllidanGUID));
 
-            if(!pCreature)
+            if (!pCreature)
                 return;
         }
 
-        if(TorlothAnim[AnimationCount].TextId)
+        if (TorlothAnim[AnimationCount].TextId)
             DoScriptText(TorlothAnim[AnimationCount].TextId, pCreature);
 
         AnimationTimer = TorlothAnim[AnimationCount].Timer;
@@ -1319,7 +1319,7 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI
             m_creature->RemoveFlag(UNIT_FIELD_BYTES_1,8);
             break;
         case 5:
-            if(Player* AggroTarget = (Unit::GetPlayer(AggroTargetGUID)))
+            if (Player* AggroTarget = (Unit::GetPlayer(AggroTargetGUID)))
             {
                 m_creature->SetUInt64Value(UNIT_FIELD_TARGET, AggroTarget->GetGUID());
                 m_creature->AddThreat(AggroTarget, 1);
@@ -1327,7 +1327,7 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI
             }
             break;
         case 6:
-            if(Player* AggroTarget = (Unit::GetPlayer(AggroTargetGUID)))
+            if (Player* AggroTarget = (Unit::GetPlayer(AggroTargetGUID)))
             {
                 m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 m_creature->clearUnitState(UNIT_STAT_ROOT);
@@ -1343,18 +1343,18 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(AnimationTimer)
+        if (AnimationTimer)
         {
-            if(AnimationTimer <= diff)
+            if (AnimationTimer <= diff)
             {
                 HandleAnimation();
             }else AnimationTimer -= diff;
         }
 
-        if(AnimationCount < 6)
+        if (AnimationCount < 6)
         {
             m_creature->CombatStop();
-        }else if(!Timers)
+        }else if (!Timers)
         {
 
             SpellTimer1 = SpawnCast[6].Timer1;
@@ -1363,21 +1363,21 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI
             Timers = true;
         }
 
-        if(Timers)
+        if (Timers)
         {
-            if(SpellTimer1 < diff)
+            if (SpellTimer1 < diff)
             {
                 DoCast(m_creature->getVictim(), SpawnCast[6].SpellId);//Cleave
                 SpellTimer1 = SpawnCast[6].Timer2 + (rand()%10 * 1000);
             }else SpellTimer1 -= diff;
 
-            if(SpellTimer2 < diff)
+            if (SpellTimer2 < diff)
             {
                 DoCast(m_creature->getVictim(), SpawnCast[7].SpellId);//Shadowfury
                 SpellTimer2 = SpawnCast[7].Timer2 + (rand()%5 * 1000);
             }else SpellTimer2 -= diff;
 
-            if(SpellTimer3 < diff)
+            if (SpellTimer3 < diff)
             {
                 DoCast(m_creature, SpawnCast[8].SpellId);
                 SpellTimer3 = SpawnCast[8].Timer2 + (rand()%7 * 1000);//Spell Reflection
@@ -1389,12 +1389,12 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI
 
     void JustDied(Unit* slayer)
     {
-        if(slayer)
+        if (slayer)
             switch(slayer->GetTypeId())
         {
             case TYPEID_UNIT:
-                if(Unit *owner = slayer->GetOwner()) 
-                    if(owner->GetTypeId() == TYPEID_PLAYER)
+                if (Unit *owner = slayer->GetOwner()) 
+                    if (owner->GetTypeId() == TYPEID_PLAYER)
                         CAST_PLR(owner)->GroupEventHappens(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, m_creature);
                 break;
 
@@ -1403,7 +1403,7 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI
                 break;
         }
 
-        if(Creature* LordIllidan = (Unit::GetCreature(*m_creature, LordIllidanGUID)))
+        if (Creature* LordIllidan = (Unit::GetCreature(*m_creature, LordIllidanGUID)))
         {
             DoScriptText(END_TEXT, LordIllidan, slayer);
             LordIllidan->AI()->EnterEvadeMode();
@@ -1469,34 +1469,34 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI
             Spawn = m_creature->SummonCreature(WavesInfo[WaveCount].CreatureId, X, Y, Z, O, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
             ++LiveCount;
 
-            if(Spawn)
+            if (Spawn)
             {
                 Spawn->LoadCreaturesAddon();
 
-                if(WaveCount == 0)//1 Wave
+                if (WaveCount == 0)//1 Wave
                 {
-                    if(rand()%3 == 1 && FelguardCount<2)
+                    if (rand()%3 == 1 && FelguardCount<2)
                     {
                         Spawn->SetDisplayId(18654);
                         ++FelguardCount;
                     }
-                    else if(DreadlordCount < 3)
+                    else if (DreadlordCount < 3)
                     {
                         Spawn->SetDisplayId(19991);
                         ++DreadlordCount;
                     }
-                    else if(FelguardCount<2)
+                    else if (FelguardCount<2)
                     {
                         Spawn->SetDisplayId(18654);
                         ++FelguardCount;
                     }
                 }
 
-                if(WaveCount < 3)//1-3 Wave
+                if (WaveCount < 3)//1-3 Wave
                 {
-                    if(PlayerGUID)
+                    if (PlayerGUID)
                     {
-                        if(Player* pTarget = Unit::GetPlayer(PlayerGUID))
+                        if (Player* pTarget = Unit::GetPlayer(PlayerGUID))
                         {
                             float x, y, z;
                             pTarget->GetPosition(x,y,z);
@@ -1506,10 +1506,10 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI
                     CAST_AI(mob_illidari_spawnAI, Spawn->AI())->LordIllidanGUID = m_creature->GetGUID();
                 }
 
-                if(WavesInfo[WaveCount].CreatureId == 22076) // Torloth
+                if (WavesInfo[WaveCount].CreatureId == 22076) // Torloth
                 {
                     CAST_AI(mob_torloth_the_magnificentAI, Spawn->AI())->LordIllidanGUID = m_creature->GetGUID();
-                    if(PlayerGUID)
+                    if (PlayerGUID)
                         CAST_AI(mob_torloth_the_magnificentAI, Spawn->AI())->AggroTargetGUID = PlayerGUID;
                 }
             }
@@ -1523,10 +1523,10 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI
     {
         Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if(!pPlayer)
+        if (!pPlayer)
             return;
 
-        if(Group *EventGroup = pPlayer->GetGroup())
+        if (Group *EventGroup = pPlayer->GetGroup())
         {
             Player* GroupMember;
 
@@ -1539,9 +1539,9 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI
             for(Group::member_citerator itr = members.begin(); itr!= members.end(); itr++)
             {
                 GroupMember = (Unit::GetPlayer(itr->guid));
-                if(!GroupMember)
+                if (!GroupMember)
                     continue;
-                if(!GroupMember->IsWithinDistInMap(m_creature, EVENT_AREA_RADIUS) && GroupMember->GetQuestStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) == QUEST_STATUS_INCOMPLETE)
+                if (!GroupMember->IsWithinDistInMap(m_creature, EVENT_AREA_RADIUS) && GroupMember->GetQuestStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) == QUEST_STATUS_INCOMPLETE)
                 {
                     GroupMember->FailQuest(QUEST_BATTLE_OF_THE_CRIMSON_WATCH);
                     GroupMember->SetQuestStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, QUEST_STATUS_NONE);
@@ -1549,24 +1549,24 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI
                 }
                 ++GroupMemberCount;
 
-                if(GroupMember->isDead())
+                if (GroupMember->isDead())
                 {
                     ++DeadMemberCount;
                 }
             }
 
-            if(GroupMemberCount == FailedMemberCount)
+            if (GroupMemberCount == FailedMemberCount)
             {
                 Failed = true;
             }
 
-            if(GroupMemberCount == DeadMemberCount)
+            if (GroupMemberCount == DeadMemberCount)
             {
                 for(Group::member_citerator itr = members.begin(); itr!= members.end(); itr++)
                 {
                     GroupMember = Unit::GetPlayer(itr->guid);
 
-                    if(GroupMember && GroupMember->GetQuestStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) == QUEST_STATUS_INCOMPLETE)
+                    if (GroupMember && GroupMember->GetQuestStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH) == QUEST_STATUS_INCOMPLETE)
                     {
                         GroupMember->FailQuest(QUEST_BATTLE_OF_THE_CRIMSON_WATCH);
                         GroupMember->SetQuestStatus(QUEST_BATTLE_OF_THE_CRIMSON_WATCH, QUEST_STATUS_NONE);
@@ -1584,31 +1584,31 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI
     void LiveCounter()
     {
         --LiveCount;
-        if(!LiveCount)
+        if (!LiveCount)
             Announced = false;
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!PlayerGUID || !EventStarted)
+        if (!PlayerGUID || !EventStarted)
             return;
 
-        if(!LiveCount && WaveCount < 4)
+        if (!LiveCount && WaveCount < 4)
         {
-            if(!Announced && AnnounceTimer < diff)
+            if (!Announced && AnnounceTimer < diff)
             {
                 DoScriptText(WavesInfo[WaveCount].WaveTextId, m_creature);
                 Announced = true;
             }else AnnounceTimer -= diff;
 
-            if(WaveTimer < diff)
+            if (WaveTimer < diff)
             {
                 SummonNextWave();
             }else WaveTimer -= diff;
         }
         CheckEventFail();
 
-        if(Failed)
+        if (Failed)
             EnterEvadeMode();
     }
 };
@@ -1616,8 +1616,8 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI
 void mob_illidari_spawnAI::JustDied(Unit *slayer)
 {
     m_creature->RemoveCorpse();
-    if(Creature* LordIllidan = (Unit::GetCreature(*m_creature, LordIllidanGUID)))
-        if(LordIllidan)
+    if (Creature* LordIllidan = (Unit::GetCreature(*m_creature, LordIllidanGUID)))
+        if (LordIllidan)
             CAST_AI(npc_lord_illidan_stormrageAI, LordIllidan->AI())->LiveCounter();
 }
 
@@ -1627,11 +1627,11 @@ void mob_illidari_spawnAI::JustDied(Unit *slayer)
 
 bool GOQuestAccept_GO_crystal_prison(Player* plr, GameObject* go, Quest const* quest)
 {
-    if(quest->GetQuestId() == QUEST_BATTLE_OF_THE_CRIMSON_WATCH )
+    if (quest->GetQuestId() == QUEST_BATTLE_OF_THE_CRIMSON_WATCH)
     {
         Creature* Illidan = plr->FindNearestCreature(22083, 50);
 
-        if(Illidan && !CAST_AI(npc_lord_illidan_stormrageAI, Illidan->AI())->EventStarted)
+        if (Illidan && !CAST_AI(npc_lord_illidan_stormrageAI, Illidan->AI())->EventStarted)
         {
             CAST_AI(npc_lord_illidan_stormrageAI, Illidan->AI())->PlayerGUID = plr->GetGUID();
             CAST_AI(npc_lord_illidan_stormrageAI, Illidan->AI())->LiveCount = 0;
@@ -1743,7 +1743,7 @@ struct TRINITY_DLL_DECL npc_enraged_spiritAI : public ScriptedAI
         Creature* Summoned = NULL;
         Unit* totemOspirits = NULL;
 
-        if ( entry != 0 )
+        if (entry != 0)
             Summoned = DoSpawnCreature(entry, 0, 0, 1, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000);
 
         // FIND TOTEM, PROCESS QUEST
diff --git a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp
index 53f9603542e..30b78188bab 100644
--- a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp
+++ b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp
@@ -69,10 +69,10 @@ struct TRINITY_DLL_DECL npc_raliq_the_drunkAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if( Uppercut_Timer < diff )
+        if (Uppercut_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_UPPERCUT);
             Uppercut_Timer = 15000;
@@ -87,22 +87,22 @@ CreatureAI* GetAI_npc_raliq_the_drunk(Creature *_Creature)
     return new npc_raliq_the_drunkAI (_Creature);
 }
 
-bool GossipHello_npc_raliq_the_drunk(Player *player, Creature *_Creature )
+bool GossipHello_npc_raliq_the_drunk(Player* pPlayer, Creature *_Creature)
 {
-    if( player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_RALIQ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_RALIQ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(9440, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(9440, _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_raliq_the_drunk(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_raliq_the_drunk(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_INFO_DEF+1 )
+    if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->CLOSE_GOSSIP_MENU();
+        pPlayer->CLOSE_GOSSIP_MENU();
         _Creature->setFaction(FACTION_HOSTILE_RD);
-        _Creature->AI()->AttackStart(player);
+        _Creature->AI()->AttackStart(pPlayer);
     }
     return true;
 }
@@ -133,8 +133,8 @@ struct TRINITY_DLL_DECL npc_salsalabimAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if( done_by->GetTypeId() == TYPEID_PLAYER )
-            if( (m_creature->GetHealth()-damage)*100 / m_creature->GetMaxHealth() < 20 )
+        if (done_by->GetTypeId() == TYPEID_PLAYER)
+            if ((m_creature->GetHealth()-damage)*100 / m_creature->GetMaxHealth() < 20)
         {
             CAST_PLR(done_by)->GroupEventHappens(QUEST_10004,m_creature);
             damage = 0;
@@ -144,10 +144,10 @@ struct TRINITY_DLL_DECL npc_salsalabimAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if( MagneticPull_Timer < diff )
+        if (MagneticPull_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_MAGNETIC_PULL);
             MagneticPull_Timer = 15000;
@@ -161,18 +161,18 @@ CreatureAI* GetAI_npc_salsalabim(Creature *_Creature)
     return new npc_salsalabimAI (_Creature);
 }
 
-bool GossipHello_npc_salsalabim(Player *player, Creature *_Creature)
+bool GossipHello_npc_salsalabim(Player* pPlayer, Creature *_Creature)
 {
-    if( player->GetQuestStatus(QUEST_10004) == QUEST_STATUS_INCOMPLETE )
+    if (pPlayer->GetQuestStatus(QUEST_10004) == QUEST_STATUS_INCOMPLETE)
     {
         _Creature->setFaction(FACTION_HOSTILE_SA);
-        _Creature->AI()->AttackStart(player);
+        _Creature->AI()->AttackStart(pPlayer);
     }
     else
     {
-        if( _Creature->isQuestGiver() )
-            player->PrepareQuestMenu( _Creature->GetGUID() );
-        player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+        if (_Creature->isQuestGiver())
+            pPlayer->PrepareQuestMenu(_Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     }
     return true;
 }
@@ -188,43 +188,43 @@ Purchase requires exalted reputation with Scryers/Aldor, Cenarion Expedition and
 ##################################################
 */
 
-bool GossipHello_npc_shattrathflaskvendors(Player *player, Creature *_Creature)
+bool GossipHello_npc_shattrathflaskvendors(Player* pPlayer, Creature *_Creature)
 {
-    if(_Creature->GetEntry() == 23484)
+    if (_Creature->GetEntry() == 23484)
     {
         // Aldor vendor
-        if( _Creature->isVendor() && (player->GetReputationRank(932) == REP_EXALTED) && (player->GetReputationRank(935) == REP_EXALTED) && (player->GetReputationRank(942) == REP_EXALTED) )
+        if (_Creature->isVendor() && (pPlayer->GetReputationRank(932) == REP_EXALTED) && (pPlayer->GetReputationRank(935) == REP_EXALTED) && (pPlayer->GetReputationRank(942) == REP_EXALTED))
         {
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
-            player->SEND_GOSSIP_MENU(11085, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+            pPlayer->SEND_GOSSIP_MENU(11085, _Creature->GetGUID());
         }
         else
         {
-            player->SEND_GOSSIP_MENU(11083, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(11083, _Creature->GetGUID());
         }
     }
 
-    if(_Creature->GetEntry() == 23483)
+    if (_Creature->GetEntry() == 23483)
     {
         // Scryers vendor
-        if( _Creature->isVendor() && (player->GetReputationRank(934) == REP_EXALTED) && (player->GetReputationRank(935) == REP_EXALTED) && (player->GetReputationRank(942) == REP_EXALTED) )
+        if (_Creature->isVendor() && (pPlayer->GetReputationRank(934) == REP_EXALTED) && (pPlayer->GetReputationRank(935) == REP_EXALTED) && (pPlayer->GetReputationRank(942) == REP_EXALTED))
         {
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
-            player->SEND_GOSSIP_MENU(11085, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+            pPlayer->SEND_GOSSIP_MENU(11085, _Creature->GetGUID());
         }
         else
         {
-            player->SEND_GOSSIP_MENU(11084, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(11084, _Creature->GetGUID());
         }
     }
 
     return true;
 }
 
-bool GossipSelect_npc_shattrathflaskvendors(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_shattrathflaskvendors(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_TRADE )
-        player->SEND_VENDORLIST( _Creature->GetGUID() );
+    if (action == GOSSIP_ACTION_TRADE)
+        pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
 
     return true;
 }
@@ -235,20 +235,20 @@ bool GossipSelect_npc_shattrathflaskvendors(Player *player, Creature *_Creature,
 
 #define GOSSIP_HZ "Take me to the Caverns of Time."
 
-bool GossipHello_npc_zephyr(Player *player, Creature *_Creature)
+bool GossipHello_npc_zephyr(Player* pPlayer, Creature *_Creature)
 {
-    if( player->GetReputationRank(989) >= REP_REVERED )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HZ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetReputationRank(989) >= REP_REVERED)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HZ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_zephyr(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_zephyr(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_INFO_DEF+1 )
-        player->CastSpell(player,37778,false);
+    if (action == GOSSIP_ACTION_INFO_DEF+1)
+        pPlayer->CastSpell(pPlayer,37778,false);
 
     return true;
 }
@@ -290,7 +290,7 @@ public:
     {
         Unit *pTemp = Unit::GetUnit(*m_creature,PlayerGUID);
 
-        if( !pTemp )
+        if (!pTemp)
             return;
 
         switch(i)
@@ -317,11 +317,11 @@ public:
             case 54: DoScriptText(WHISP19, m_creature, pTemp); break;
             case 55: DoScriptText(WHISP20, m_creature, pTemp); break;
             case 56: DoScriptText(WHISP21, m_creature, pTemp);
-                if( PlayerGUID )
+                if (PlayerGUID)
                 {
-                    Player* player = (Unit::GetPlayer(PlayerGUID));
-                    if( player )
-                        player->GroupEventHappens(10211,m_creature);
+                    Player* pPlayer = (Unit::GetPlayer(PlayerGUID));
+                    if (pPlayer)
+                        pPlayer->GroupEventHappens(10211,m_creature);
                 }
                 break;
         }
@@ -331,15 +331,15 @@ public:
 
     void MoveInLineOfSight(Unit *who)
     {
-        if( IsBeingEscorted )
+        if (IsBeingEscorted)
             return;
 
-        if( who->GetTypeId() == TYPEID_PLAYER )
+        if (who->GetTypeId() == TYPEID_PLAYER)
         {
-            if( CAST_PLR(who)->GetQuestStatus(10211) == QUEST_STATUS_INCOMPLETE )
+            if (CAST_PLR(who)->GetQuestStatus(10211) == QUEST_STATUS_INCOMPLETE)
             {
                 float Radius = 10.0;
-                if( m_creature->IsWithinDistInMap(who, Radius) )
+                if (m_creature->IsWithinDistInMap(who, Radius))
                 {
                     Start(false, false, who->GetGUID());
                 }
@@ -406,14 +406,14 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI
         m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
         m_creature->setFaction(1194);
         Unit* Creepjack = me->FindNearestCreature(NPC_CREEPJACK, 20);
-        if(Creepjack)
+        if (Creepjack)
         {
             CAST_CRE(Creepjack)->AI()->EnterEvadeMode();
             Creepjack->setFaction(1194);
             Creepjack->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
         }
         Unit* Malone = me->FindNearestCreature(NPC_MALONE, 20);
-        if(Malone)
+        if (Malone)
         {
             CAST_CRE(Malone)->AI()->EnterEvadeMode();
             Malone->setFaction(1194);
@@ -423,23 +423,23 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI
 
     uint32 NextStep(uint32 Step)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
         switch(Step)
         {
-        case 0:{ m_creature->SetInFront(player);
+        case 0:{ m_creature->SetInFront(pPlayer);
             Unit* Creepjack = me->FindNearestCreature(NPC_CREEPJACK, 20);
-            if(Creepjack)
+            if (Creepjack)
                 Creepjack->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
             Unit* Malone = me->FindNearestCreature(NPC_MALONE, 20);
-            if(Malone)
+            if (Malone)
                 Malone->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
             m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); }return 2000;
-        case 1: DoScriptText(SAY_1, m_creature, player); return 3000;
-        case 2: DoScriptText(SAY_2, m_creature, player); return 5000;
-        case 3: DoScriptText(SAY_3, m_creature, player); return 2000;
-        case 4: DoScriptText(SAY_4, m_creature, player); return 2000;
-        case 5: DoScriptText(SAY_5, m_creature, player); return 2000;
+        case 1: DoScriptText(SAY_1, m_creature, pPlayer); return 3000;
+        case 2: DoScriptText(SAY_2, m_creature, pPlayer); return 5000;
+        case 3: DoScriptText(SAY_3, m_creature, pPlayer); return 2000;
+        case 4: DoScriptText(SAY_4, m_creature, pPlayer); return 2000;
+        case 5: DoScriptText(SAY_5, m_creature, pPlayer); return 2000;
         case 6: Attack = true; return 2000;
         default: return 0;
         }
@@ -449,45 +449,45 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(SayTimer < diff)
+        if (SayTimer < diff)
         {
-            if(Event)
+            if (Event)
                 SayTimer = NextStep(++Step);
         }else SayTimer -= diff;
 
-        if(Attack)
+        if (Attack)
         {
-            Player* player = Unit::GetPlayer(PlayerGUID);
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
             m_creature->setFaction(14);
             m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-            if(player)
+            if (pPlayer)
             {
             Unit* Creepjack = me->FindNearestCreature(NPC_CREEPJACK, 20);
-            if(Creepjack)
+            if (Creepjack)
             {
-                Creepjack->Attack(player, true);
+                Creepjack->Attack(pPlayer, true);
                 Creepjack->setFaction(14);
-                Creepjack->GetMotionMaster()->MoveChase(player);
+                Creepjack->GetMotionMaster()->MoveChase(pPlayer);
                 Creepjack->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             }
             Unit* Malone = me->FindNearestCreature(NPC_MALONE, 20);
-            if(Malone)
+            if (Malone)
             {
-                Malone->Attack(player, true);
+                Malone->Attack(pPlayer, true);
                 Malone->setFaction(14);
-                Malone->GetMotionMaster()->MoveChase(player);
+                Malone->GetMotionMaster()->MoveChase(pPlayer);
                 Malone->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             }
-                DoStartMovement(player);
-                AttackStart(player);
+                DoStartMovement(pPlayer);
+                AttackStart(pPlayer);
             }
             Attack = false;
         }
 
-        if((m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 1 && !Done)
+        if ((m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 1 && !Done)
         {
             Unit* Creepjack = me->FindNearestCreature(NPC_CREEPJACK, 20);
-            if(Creepjack)
+            if (Creepjack)
             {
                 CAST_CRE(Creepjack)->AI()->EnterEvadeMode();
                 Creepjack->setFaction(1194);
@@ -495,7 +495,7 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI
                 Creepjack->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             }
             Unit* Malone = me->FindNearestCreature(NPC_MALONE, 20);
-            if(Malone)
+            if (Malone)
             {
                 CAST_CRE(Malone)->AI()->EnterEvadeMode();
                 Malone->setFaction(1194);
@@ -509,33 +509,33 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI
             m_creature->DeleteThreatList();
             m_creature->CombatStop();
             m_creature->GetMotionMaster()->MoveTargetedHome();
-            Player* player = Unit::GetPlayer(PlayerGUID);
-            if(player)
-                CAST_PLR(player)->GroupEventHappens(QUEST_WBI, m_creature);
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (pPlayer)
+                CAST_PLR(pPlayer)->GroupEventHappens(QUEST_WBI, m_creature);
         }
         DoMeleeAttackIfReady();
     }
 };
 
-bool GossipHello_npc_dirty_larry(Player *player, Creature *creature)
+bool GossipHello_npc_dirty_larry(Player* pPlayer, Creature *creature)
 {
     if (creature->isQuestGiver())
-        player->PrepareQuestMenu(creature->GetGUID());
+        pPlayer->PrepareQuestMenu(creature->GetGUID());
 
-    if(player->GetQuestStatus(QUEST_WBI) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BOOK, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(QUEST_WBI) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BOOK, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(creature->GetNpcTextId(), creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(creature->GetNpcTextId(), creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_dirty_larry(Player *player, Creature *creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_dirty_larry(Player* pPlayer, Creature *creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
         CAST_AI(npc_dirty_larryAI, creature->AI())->Event = true;
-        CAST_AI(npc_dirty_larryAI, creature->AI())->PlayerGUID = player->GetGUID();
-        player->CLOSE_GOSSIP_MENU();
+        CAST_AI(npc_dirty_larryAI, creature->AI())->PlayerGUID = pPlayer->GetGUID();
+        pPlayer->CLOSE_GOSSIP_MENU();
     }
 
     return true;
@@ -553,25 +553,25 @@ CreatureAI* GetAI_npc_dirty_larryAI(Creature *_Creature)
 #define ISANAH_GOSSIP_1 "Who are the Sha'tar?"
 #define ISANAH_GOSSIP_2 "Isn't Shattrath a draenei city? Why do you allow others here?"
 
-bool GossipHello_npc_ishanah(Player *player, Creature *_Creature)
+bool GossipHello_npc_ishanah(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu(_Creature->GetGUID());
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, ISANAH_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, ISANAH_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, ISANAH_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, ISANAH_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_ishanah(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_ishanah(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if(action == GOSSIP_ACTION_INFO_DEF+1)
-        player->SEND_GOSSIP_MENU(9458, _Creature->GetGUID());
-    else if(action == GOSSIP_ACTION_INFO_DEF+2)
-        player->SEND_GOSSIP_MENU(9459, _Creature->GetGUID());
+    if (action == GOSSIP_ACTION_INFO_DEF+1)
+        pPlayer->SEND_GOSSIP_MENU(9458, _Creature->GetGUID());
+    else if (action == GOSSIP_ACTION_INFO_DEF+2)
+        pPlayer->SEND_GOSSIP_MENU(9459, _Creature->GetGUID());
 
     return true;
 }
@@ -587,50 +587,50 @@ bool GossipSelect_npc_ishanah(Player *player, Creature *_Creature, uint32 sender
 #define KHADGAR_GOSSIP_5    "What happened next?"
 #define KHADGAR_GOSSIP_7    "There was something else I wanted to ask you."
 
-bool GossipHello_npc_khadgar(Player *player, Creature *creature)
+bool GossipHello_npc_khadgar(Player* pPlayer, Creature *creature)
 {
     if (creature->isQuestGiver())
-        player->PrepareQuestMenu(creature->GetGUID());
+        pPlayer->PrepareQuestMenu(creature->GetGUID());
 
-    if(!player->hasQuest(10211))
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (!pPlayer->hasQuest(10211))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-        player->SEND_GOSSIP_MENU(9243, creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(9243, creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_khadgar(Player *player, Creature *creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_khadgar(Player* pPlayer, Creature *creature, uint32 sender, uint32 action)
 {
     switch(action)
     {
     case GOSSIP_ACTION_INFO_DEF+1:
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-        player->SEND_GOSSIP_MENU(9876, creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+        pPlayer->SEND_GOSSIP_MENU(9876, creature->GetGUID());
         break;
     case GOSSIP_ACTION_INFO_DEF+2:
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-        player->SEND_GOSSIP_MENU(9877, creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+        pPlayer->SEND_GOSSIP_MENU(9877, creature->GetGUID());
         break;
     case GOSSIP_ACTION_INFO_DEF+3:
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
-        player->SEND_GOSSIP_MENU(9878, creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+        pPlayer->SEND_GOSSIP_MENU(9878, creature->GetGUID());
         break;
     case GOSSIP_ACTION_INFO_DEF+4:
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-        player->SEND_GOSSIP_MENU(9879, creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+        pPlayer->SEND_GOSSIP_MENU(9879, creature->GetGUID());
         break;
     case GOSSIP_ACTION_INFO_DEF+5:
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
-        player->SEND_GOSSIP_MENU(9880, creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
+        pPlayer->SEND_GOSSIP_MENU(9880, creature->GetGUID());
         break;
     case GOSSIP_ACTION_INFO_DEF+6:
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
-        player->SEND_GOSSIP_MENU(9881, creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
+        pPlayer->SEND_GOSSIP_MENU(9881, creature->GetGUID());
         break;
     case GOSSIP_ACTION_INFO_DEF+7:
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->SEND_GOSSIP_MENU(9243, creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->SEND_GOSSIP_MENU(9243, creature->GetGUID());
         break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/sholazar_basin/sholazar_basin.cpp b/src/bindings/scripts/scripts/zone/sholazar_basin/sholazar_basin.cpp
index 7034f68ae5f..6e40d6e05bb 100644
--- a/src/bindings/scripts/scripts/zone/sholazar_basin/sholazar_basin.cpp
+++ b/src/bindings/scripts/scripts/zone/sholazar_basin/sholazar_basin.cpp
@@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL npc_injured_rainspeaker_oracleAI : public npc_escortAI
     {
         me->RestoreFaction();
         // if we will have other way to assign this to only one npc remove this part
-        if(GUID_LOPART(me->GetGUID()) != 101030)
+        if (GUID_LOPART(me->GetGUID()) != 101030)
         {
             me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
             me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@@ -64,9 +64,9 @@ struct TRINITY_DLL_DECL npc_injured_rainspeaker_oracleAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if(!player)
+        if (!pPlayer)
             return;
 
         switch(i)
@@ -90,8 +90,8 @@ struct TRINITY_DLL_DECL npc_injured_rainspeaker_oracleAI : public npc_escortAI
             m_creature->SetUnitMovementFlags(MOVEMENTFLAG_JUMPING);
             break;
         case 28:
-            if(Player* pPlayer = Unit::GetPlayer( PlayerGUID))
-                player->GroupEventHappens(QUEST_FORTUNATE_MISUNDERSTANDINGS, m_creature);
+            if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
+                pPlayer->GroupEventHappens(QUEST_FORTUNATE_MISUNDERSTANDINGS, m_creature);
           //  me->RestoreFaction();
             DoScriptText(SAY_END_IRO,m_creature);
             SetRun(false);
@@ -104,43 +104,43 @@ struct TRINITY_DLL_DECL npc_injured_rainspeaker_oracleAI : public npc_escortAI
         if (!IsBeingEscorted)
             return;
 
-        if(Player* pPlayer = Unit::GetPlayer(PlayerGUID))
+        if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
         {            
-          if(pPlayer->GetQuestStatus(QUEST_FORTUNATE_MISUNDERSTANDINGS) != QUEST_STATUS_COMPLETE)
+          if (pPlayer->GetQuestStatus(QUEST_FORTUNATE_MISUNDERSTANDINGS) != QUEST_STATUS_COMPLETE)
             pPlayer->FailQuest(QUEST_FORTUNATE_MISUNDERSTANDINGS);
         }
     }
 
-    void UpdateAI(Player *player, Creature *_Creature,const uint32 diff)
+    void UpdateAI(Player* pPlayer, Creature *_Creature,const uint32 diff)
     {
         npc_escortAI::UpdateAI(diff);
     }
 };
 
 
-bool GossipHello_npc_injured_rainspeaker_oracle(Player *player, Creature *_Creature )
+bool GossipHello_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature *_Creature)
 {
-    if( _Creature->isQuestGiver() )
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( player->GetQuestStatus(QUEST_FORTUNATE_MISUNDERSTANDINGS) == QUEST_STATUS_INCOMPLETE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(QUEST_FORTUNATE_MISUNDERSTANDINGS) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_injured_rainspeaker_oracle(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_INFO_DEF+1 )
+    if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, false, player->GetGUID());
+        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, false, pPlayer->GetGUID());
         CAST_AI(npc_escortAI, (_Creature->AI()))->SetMaxPlayerDistance(35.0f);
         _Creature->SetUnitMovementFlags(MOVEMENTFLAG_JUMPING);
         DoScriptText(SAY_START_IRO,_Creature);
 
-        switch (player->GetTeam()){
+        switch (pPlayer->GetTeam()){
         case ALLIANCE:
             _Creature->setFaction(FACTION_ESCORTEE_A);
             break;
@@ -152,7 +152,7 @@ bool GossipSelect_npc_injured_rainspeaker_oracle(Player *player, Creature *_Crea
     return true;
 }
 
-bool QuestAccept_npc_injured_rainspeaker_oracle(Player *player, Creature *_Creature, Quest const *_Quest)
+bool QuestAccept_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature *_Creature, Quest const *_Quest)
 {
     DoScriptText(SAY_QUEST_ACCEPT_IRO,_Creature);
     return false;
diff --git a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp
index e748f39eab9..d590f0efdef 100644
--- a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp
+++ b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp
@@ -40,54 +40,54 @@ EndContentData */
 #define GOSSIP_DEMITRIAN6 "Caught unaware? How?"
 #define GOSSIP_DEMITRIAN7 "So what did Ragnaros do next?"
 
-bool GossipHello_npc_highlord_demitrian(Player *player, Creature *_Creature)
+bool GossipHello_npc_highlord_demitrian(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu(_Creature->GetGUID());
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(7785) == QUEST_STATUS_NONE &&
-        (player->HasItemCount(18563,1,false) || player->HasItemCount(18564,1,false)))
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(7785) == QUEST_STATUS_NONE &&
+        (pPlayer->HasItemCount(18563,1,false) || pPlayer->HasItemCount(18564,1,false)))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(6812, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(6812, _Creature->GetGUID());
         return true;
 }
 
-bool GossipSelect_npc_highlord_demitrian(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_highlord_demitrian(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
     case GOSSIP_ACTION_INFO_DEF:
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->SEND_GOSSIP_MENU(6842, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->SEND_GOSSIP_MENU(6842, _Creature->GetGUID());
         break;
     case GOSSIP_ACTION_INFO_DEF+1:
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-        player->SEND_GOSSIP_MENU(6843, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+        pPlayer->SEND_GOSSIP_MENU(6843, _Creature->GetGUID());
         break;
     case GOSSIP_ACTION_INFO_DEF+2:
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-        player->SEND_GOSSIP_MENU(6844, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+        pPlayer->SEND_GOSSIP_MENU(6844, _Creature->GetGUID());
         break;
     case GOSSIP_ACTION_INFO_DEF+3:
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
-        player->SEND_GOSSIP_MENU(6867, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+        pPlayer->SEND_GOSSIP_MENU(6867, _Creature->GetGUID());
         break;
     case GOSSIP_ACTION_INFO_DEF+4:
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-        player->SEND_GOSSIP_MENU(6868, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+        pPlayer->SEND_GOSSIP_MENU(6868, _Creature->GetGUID());
         break;
     case GOSSIP_ACTION_INFO_DEF+5:
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
-        player->SEND_GOSSIP_MENU(6869, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
+        pPlayer->SEND_GOSSIP_MENU(6869, _Creature->GetGUID());
         break;
     case GOSSIP_ACTION_INFO_DEF+6:
-        player->SEND_GOSSIP_MENU(6870, _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(6870, _Creature->GetGUID());
 
         ItemPosCountVec dest;
-        uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 19016, 1);
+        uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 19016, 1);
         if (msg == EQUIP_ERR_OK)
-            player->StoreNewItem(dest, 19016, true);
+            pPlayer->StoreNewItem(dest, 19016, true);
         break;
     }
     return true;
@@ -117,84 +117,84 @@ bool GossipSelect_npc_highlord_demitrian(Player *player, Creature *_Creature, ui
 #define TRIGGER_RUTGAR 15222
 #define TRIGGER_FRANKAL 15221
 
-bool GossipHello_npcs_rutgar_and_frankal(Player *player, Creature *_Creature)
+bool GossipHello_npcs_rutgar_and_frankal(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE &&
+    if (pPlayer->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE &&
         _Creature->GetEntry() == 15170 &&
-        !player->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR ))
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        !pPlayer->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    if (player->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE &&
+    if (pPlayer->GetQuestStatus(8304) == QUEST_STATUS_INCOMPLETE &&
         _Creature->GetEntry() == 15171 &&
-        player->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR ))
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
+        pPlayer->GetReqKillOrCastCurrentCount(8304, TRIGGER_RUTGAR))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
 
-    player->SEND_GOSSIP_MENU(7754, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(7754, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npcs_rutgar_and_frankal(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npcs_rutgar_and_frankal(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->SEND_GOSSIP_MENU(7755, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(7755, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(7756, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(7756, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(7757, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(7757, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->SEND_GOSSIP_MENU(7758, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(7758, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->SEND_GOSSIP_MENU(7759, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(7759, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
-            player->SEND_GOSSIP_MENU(7760, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            pPlayer->SEND_GOSSIP_MENU(7760, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:
-            player->SEND_GOSSIP_MENU(7761, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(7761, _Creature->GetGUID());
                                                             //'kill' our trigger to update quest status
-            player->KilledMonsterCredit( TRIGGER_RUTGAR, _Creature->GetGUID() );
+            pPlayer->KilledMonsterCredit(TRIGGER_RUTGAR, _Creature->GetGUID());
             break;
 
         case GOSSIP_ACTION_INFO_DEF + 9:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->SEND_GOSSIP_MENU(7762, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->SEND_GOSSIP_MENU(7762, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM12, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
-            player->SEND_GOSSIP_MENU(7763, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM12, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            pPlayer->SEND_GOSSIP_MENU(7763, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM13, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
-            player->SEND_GOSSIP_MENU(7764, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM13, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            pPlayer->SEND_GOSSIP_MENU(7764, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM14, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
-            player->SEND_GOSSIP_MENU(7765, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM14, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
+            pPlayer->SEND_GOSSIP_MENU(7765, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 13:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM15, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
-            player->SEND_GOSSIP_MENU(7766, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM15, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
+            pPlayer->SEND_GOSSIP_MENU(7766, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 14:
-            player->SEND_GOSSIP_MENU(7767, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(7767, _Creature->GetGUID());
                                                             //'kill' our trigger to update quest status
-            player->KilledMonsterCredit( TRIGGER_FRANKAL, _Creature->GetGUID() );
+            pPlayer->KilledMonsterCredit(TRIGGER_FRANKAL, _Creature->GetGUID());
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp
index 718a44acf58..3e7874a7a54 100644
--- a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp
+++ b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp
@@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL npc_blood_knight_stillbladeAI : public ScriptedAI
     {
         if (m_creature->IsStandState())
         {
-            if(lifeTimer < diff)
+            if (lifeTimer < diff)
                 m_creature->AI()->EnterEvadeMode();
             else
                 lifeTimer -= diff;
@@ -74,7 +74,7 @@ struct TRINITY_DLL_DECL npc_blood_knight_stillbladeAI : public ScriptedAI
 
     void SpellHit(Unit *Hitter, const SpellEntry *Spellkind)
     {
-        if((Spellkind->Id == SPELL_SHIMMERING_VESSEL) && !spellHit &&
+        if ((Spellkind->Id == SPELL_SHIMMERING_VESSEL) && !spellHit &&
             (Hitter->GetTypeId() == TYPEID_PLAYER) && (CAST_PLR(Hitter)->IsActiveQuest(QUEST_REDEEMING_THE_DEAD)))
         {
             CAST_PLR(Hitter)->AreaExploredOrEventHappens(QUEST_REDEEMING_THE_DEAD);
diff --git a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp
index df81dfd51f9..0c32470f659 100644
--- a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp
+++ b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp
@@ -59,29 +59,29 @@ CreatureAI* GetAI_npc_astor_hadren(Creature *_creature)
     return new npc_astor_hadrenAI(_creature);
 }
 
-bool GossipHello_npc_astor_hadren(Player *player, Creature *_Creature)
+bool GossipHello_npc_astor_hadren(Player* pPlayer, Creature *_Creature)
 {
-    if (player->GetQuestStatus(1886) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    if (pPlayer->GetQuestStatus(1886) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
 
-    player->SEND_GOSSIP_MENU(623, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(623, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_astor_hadren(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_astor_hadren(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(624, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(624, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            player->CLOSE_GOSSIP_MENU();
+            pPlayer->CLOSE_GOSSIP_MENU();
             _Creature->setFaction(21);
-            if(player)
-                CAST_AI(npc_astor_hadrenAI, _Creature->AI())->AttackStart(player);
+            if (pPlayer)
+                CAST_AI(npc_astor_hadrenAI, _Creature->AI())->AttackStart(pPlayer);
             break;
     }
     return true;
@@ -119,21 +119,21 @@ struct TRINITY_DLL_DECL npc_deathstalker_erlandAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!player)
+        if (!pPlayer)
             return;
 
         switch(i)
         {
-        case 1: DoScriptText(SAY_START, m_creature, player);break;
+        case 1: DoScriptText(SAY_START, m_creature, pPlayer);break;
         case 13:
-            DoScriptText(SAY_LAST, m_creature, player);
-            player->GroupEventHappens(QUEST_ESCORTING, m_creature);break;
-        case 14: DoScriptText(SAY_THANKS, m_creature, player);break;
+            DoScriptText(SAY_LAST, m_creature, pPlayer);
+            pPlayer->GroupEventHappens(QUEST_ESCORTING, m_creature);break;
+        case 14: DoScriptText(SAY_THANKS, m_creature, pPlayer);break;
         case 15: {
                 Unit* Rane = me->FindNearestCreature(NPC_RANE, 20);
-                if(Rane)
+                if (Rane)
                     DoScriptText(SAY_RANE, Rane);
                 break;}
         case 16: DoScriptText(SAY_ANSWER, m_creature);break;
@@ -141,7 +141,7 @@ struct TRINITY_DLL_DECL npc_deathstalker_erlandAI : public npc_escortAI
         case 24: DoScriptText(SAY_GREETINGS, m_creature);break;
         case 25: {
                 Unit* Quinn = me->FindNearestCreature(NPC_QUINN, 20);
-                if(Quinn)
+                if (Quinn)
                     DoScriptText(SAY_QUINN, Quinn);
                 break;}
         case 26: DoScriptText(SAY_ON_BYE, m_creature, NULL);break;
@@ -166,12 +166,12 @@ struct TRINITY_DLL_DECL npc_deathstalker_erlandAI : public npc_escortAI
     }
 };
 
-bool QuestAccept_npc_deathstalker_erland(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_deathstalker_erland(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_ESCORTING)
     {
-        DoScriptText(SAY_QUESTACCEPT, creature, player);
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
+        DoScriptText(SAY_QUESTACCEPT, creature, pPlayer);
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
     }
 
     return true;
diff --git a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp
index 8a548a080f2..de695417a57 100644
--- a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp
+++ b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp
@@ -39,39 +39,39 @@ EndContentData */
 #define GOSSIP_HBD4 "Alexstrasza"
 #define GOSSIP_HBD5 "Malygos"
 
-bool GossipHello_npc_braug_dimspirit(Player *player, Creature *_Creature)
+bool GossipHello_npc_braug_dimspirit(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(6627) == QUEST_STATUS_INCOMPLETE)
+    if (pPlayer->GetQuestStatus(6627) == QUEST_STATUS_INCOMPLETE)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBD5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-        player->SEND_GOSSIP_MENU(5820, _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(5820, _Creature->GetGUID());
     }
     else
-        player->SEND_GOSSIP_MENU(5819, _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(5819, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_braug_dimspirit(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_braug_dimspirit(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->CLOSE_GOSSIP_MENU();
-        _Creature->CastSpell(player,6766,false);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        _Creature->CastSpell(pPlayer,6766,false);
 
     }
     if (action == GOSSIP_ACTION_INFO_DEF+2)
     {
-        player->CLOSE_GOSSIP_MENU();
-        player->AreaExploredOrEventHappens(6627);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->AreaExploredOrEventHappens(6627);
     }
     return true;
 }
@@ -101,9 +101,9 @@ struct TRINITY_DLL_DECL npc_kaya_flathoofAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if(!player)
+        if (!pPlayer)
             return;
 
         switch(i)
@@ -114,10 +114,10 @@ struct TRINITY_DLL_DECL npc_kaya_flathoofAI : public npc_escortAI
             m_creature->SummonCreature(NPC_GRIMTOTEM_RUFFIAN, -38.85, -503.77, -45.90, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
             m_creature->SummonCreature(NPC_GRIMTOTEM_SORCERER, -36.37, -496.23, -45.71, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
             break;
-        case 18: m_creature->SetInFront(player);
-            DoScriptText(SAY_END, m_creature, player);
-            if (player && player->GetTypeId() == TYPEID_PLAYER)
-                CAST_PLR(player)->GroupEventHappens(QUEST_PROTECT_KAYA, m_creature);
+        case 18: m_creature->SetInFront(pPlayer);
+            DoScriptText(SAY_END, m_creature, pPlayer);
+            if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)
+                CAST_PLR(pPlayer)->GroupEventHappens(QUEST_PROTECT_KAYA, m_creature);
             break;
         }
     }
@@ -135,9 +135,9 @@ struct TRINITY_DLL_DECL npc_kaya_flathoofAI : public npc_escortAI
     {
         if (PlayerGUID)
         {
-            Player* player = Unit::GetPlayer(PlayerGUID);
-            if (player)
-                CAST_PLR(player)->FailQuest(QUEST_PROTECT_KAYA);
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (pPlayer)
+                CAST_PLR(pPlayer)->FailQuest(QUEST_PROTECT_KAYA);
         }
     }
 
@@ -147,11 +147,11 @@ struct TRINITY_DLL_DECL npc_kaya_flathoofAI : public npc_escortAI
     }
 };
 
-bool QuestAccept_npc_kaya_flathoof(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_kaya_flathoof(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_PROTECT_KAYA)
     {
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
         DoScriptText(SAY_START, creature);
         creature->setFaction(113);
         creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
diff --git a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp
index 114732a2015..b8fe88462ea 100644
--- a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp
+++ b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp
@@ -36,25 +36,25 @@ EndContentData */
 
 #define GOSSIP_ITEM_MALIN "Can you send me to Theramore? I have an urgent message for Lady Jaina from Highlord Bolvar."
 
-bool GossipHello_npc_archmage_malin(Player *player, Creature *_Creature)
+bool GossipHello_npc_archmage_malin(Player* pPlayer, Creature *_Creature)
 {
-    if(_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if(player->GetQuestStatus(11223) == QUEST_STATUS_COMPLETE && !player->GetQuestRewardStatus(11223))
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MALIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(11223) == QUEST_STATUS_COMPLETE && !pPlayer->GetQuestRewardStatus(11223))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MALIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_archmage_malin(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_archmage_malin(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF)
     {
-        player->CLOSE_GOSSIP_MENU();
-        _Creature->CastSpell(player, 42711, true);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        _Creature->CastSpell(pPlayer, 42711, true);
     }
 
     return true;
@@ -177,7 +177,7 @@ struct TRINITY_DLL_DECL npc_dashel_stonefistAI : public ScriptedAI
 
 bool QuestAccept_npc_dashel_stonefist(Player* pPlayer, Creature* pCreature, Quest const* pQuest)
 {
-    if(pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT8)
+    if (pQuest->GetQuestId() == QUEST_MISSING_DIPLO_PT8)
     {
         pCreature->setFaction(FACTION_HOSTILE);
         CAST_AI(npc_dashel_stonefistAI, pCreature->AI())->AttackStart(pPlayer);
@@ -199,38 +199,38 @@ CreatureAI* GetAI_npc_dashel_stonefist(Creature* pCreature)
 #define GOSSIP_ITEM_KAT_3 "Begging your pardon, Lady Prestor. That was not my intent."
 #define GOSSIP_ITEM_KAT_4 "Thank you for your time, Lady Prestor."
 
-bool GossipHello_npc_lady_katrana_prestor(Player *player, Creature *_Creature)
+bool GossipHello_npc_lady_katrana_prestor(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(4185) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(4185) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(2693, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(2693, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_lady_katrana_prestor(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_lady_katrana_prestor(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->SEND_GOSSIP_MENU(2694, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(2694, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(2695, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(2695, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(2696, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(2696, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(4185);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(4185);
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp b/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp
index daeeb3e11e5..20522d440ad 100644
--- a/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp
+++ b/src/bindings/scripts/scripts/zone/stranglethorn_vale/stranglethorn_vale.cpp
@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL mob_yennikuAI : public ScriptedAI
         if (caster->GetTypeId() == TYPEID_PLAYER)
         {
                                                             //Yenniku's Release
-            if(!bReset && CAST_PLR(caster)->GetQuestStatus(592) == QUEST_STATUS_INCOMPLETE && spell->Id == 3607)
+            if (!bReset && CAST_PLR(caster)->GetQuestStatus(592) == QUEST_STATUS_INCOMPLETE && spell->Id == 3607)
             {
                 m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_STUN);
                 m_creature->CombatStop();                   //stop combat
@@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL mob_yennikuAI : public ScriptedAI
     {
         if (bReset)
         {
-            if(Reset_Timer < diff)
+            if (Reset_Timer < diff)
             {
                 EnterEvadeMode();
                 bReset = false;
@@ -81,12 +81,12 @@ struct TRINITY_DLL_DECL mob_yennikuAI : public ScriptedAI
             }
             else Reset_Timer -= diff;
 
-            if(m_creature->isInCombat() && m_creature->getVictim())
+            if (m_creature->isInCombat() && m_creature->getVictim())
             {
-                if(m_creature->getVictim()->GetTypeId() == TYPEID_PLAYER)
+                if (m_creature->getVictim()->GetTypeId() == TYPEID_PLAYER)
                 {
                     Unit *victim = m_creature->getVictim();
-                    if(CAST_PLR(victim)->GetTeam() == HORDE)
+                    if (CAST_PLR(victim)->GetTeam() == HORDE)
                     {
                         m_creature->CombatStop();
                         m_creature->DeleteThreatList();
@@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL mob_yennikuAI : public ScriptedAI
          }
 
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp
index 2d2c7605404..7d6f5e053b7 100644
--- a/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp
+++ b/src/bindings/scripts/scripts/zone/stratholme/boss_nerubenkan.cpp
@@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI
         }
         Rand = 0;
         Summoned = DoSpawnCreature(10876, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000);
-        if(Summoned)
+        if (Summoned)
             (Summoned->AI())->AttackStart(victim);
     }
 
diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp
index 4d6dc2a6b06..54847f29fe4 100644
--- a/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp
+++ b/src/bindings/scripts/scripts/zone/stratholme/boss_order_of_silver_hand.cpp
@@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_silver_hand_bossesAI : public ScriptedAI
         HolyLight_Timer = 20000;
         DivineShield_Timer = 20000;
 
-        if(pInstance)
+        if (pInstance)
         {
             switch(m_creature->GetEntry())
             {
@@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL boss_silver_hand_bossesAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if(pInstance)
+        if (pInstance)
         {
             switch(m_creature->GetEntry())
             {
@@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL boss_silver_hand_bossesAI : public ScriptedAI
                     pInstance->SetData(TYPE_SH_VICAR, 2);
                     break;
             }
-            if(pInstance->GetData(TYPE_SH_QUEST) && Killer->GetTypeId() == TYPEID_PLAYER)
+            if (pInstance->GetData(TYPE_SH_QUEST) && Killer->GetTypeId() == TYPEID_PLAYER)
                 CAST_PLR(Killer)->KilledMonsterCredit(SH_QUEST_CREDIT,m_creature->GetGUID());
         }
     }
@@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL boss_silver_hand_bossesAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (HolyLight_Timer < diff)
diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp
index 0ccde5f39fc..ed6131dff0f 100644
--- a/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp
+++ b/src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp
@@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_ramstein_the_gorgerAI : public ScriptedAI
     {
         for(uint8 i = 0; i < 30; ++i)
         {
-            if(Creature* mob = m_creature->SummonCreature(C_MINDLESS_UNDEAD,3969.35+irand(-10,10),-3391.87+irand(-10,10),119.11,5.91,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000))
+            if (Creature* mob = m_creature->SummonCreature(C_MINDLESS_UNDEAD,3969.35+irand(-10,10),-3391.87+irand(-10,10),119.11,5.91,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000))
                 mob->AI()->AttackStart(m_creature->SelectNearestTarget(500));
         }
 
diff --git a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp
index a58c2cf0da7..1ca805e1abf 100644
--- a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp
+++ b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp
@@ -49,7 +49,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
 {
-    instance_stratholme(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_stratholme(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounter[ENCOUNTERS];
 
@@ -158,12 +158,12 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
         case GO_ZIGGURAT3:          ziggurat3GUID = go->GetGUID(); break;
         case GO_ZIGGURAT4:          
             ziggurat4GUID = go->GetGUID(); 
-            if(TYPE_BARON == DONE || TYPE_RAMSTEIN == DONE)
+            if (TYPE_BARON == DONE || TYPE_RAMSTEIN == DONE)
                 HandleGameObject(0, true, go);
             break;
         case GO_ZIGGURAT5:          
             ziggurat5GUID = go->GetGUID(); 
-            if(TYPE_BARON == DONE || TYPE_RAMSTEIN == DONE)
+            if (TYPE_BARON == DONE || TYPE_RAMSTEIN == DONE)
                 HandleGameObject(0, true, go);
             break;
         case GO_PORT_GAUNTLET:      portGauntletGUID = go->GetGUID(); break;
@@ -303,7 +303,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
             IsSilverHandDead[4] = (data) ? true : false;
             break;
         }
-        if(data == DONE)SaveToDB();
+        if (data == DONE)SaveToDB();
     }
 
     std::string GetSaveData()
@@ -344,7 +344,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
           switch(type)
           {
           case TYPE_SH_QUEST:
-              if(IsSilverHandDead[0] && IsSilverHandDead[1] && IsSilverHandDead[2] && IsSilverHandDead[3] && IsSilverHandDead[4])
+              if (IsSilverHandDead[0] && IsSilverHandDead[1] && IsSilverHandDead[2] && IsSilverHandDead[3] && IsSilverHandDead[4])
                   return 1;
               return 0;
           case TYPE_BARON_RUN:
@@ -407,9 +407,9 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_stratholme(Map* map)
+InstanceData* GetInstanceData_instance_stratholme(Map* pMap)
 {
-    return new instance_stratholme(map);
+    return new instance_stratholme(pMap);
 }
 
 void AddSC_instance_stratholme()
diff --git a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp
index ccd93def4f5..a5dfd69fd61 100644
--- a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp
+++ b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp
@@ -35,7 +35,7 @@ EndContentData */
 ## go_gauntlet_gate (this is the _first_ of the gauntlet gates, two exist)
 ######*/
 
-bool GOHello_go_gauntlet_gate(Player *player, GameObject* _GO)
+bool GOHello_go_gauntlet_gate(Player* pPlayer, GameObject* _GO)
 {
     ScriptedInstance* pInstance = _GO->GetInstanceData();
 
@@ -45,7 +45,7 @@ bool GOHello_go_gauntlet_gate(Player *player, GameObject* _GO)
     if (pInstance->GetData(TYPE_BARON_RUN) != NOT_STARTED)
         return false;
 
-    if (Group *pGroup = player->GetGroup())
+    if (Group *pGroup = pPlayer->GetGroup())
     {
         for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
         {
@@ -58,10 +58,10 @@ bool GOHello_go_gauntlet_gate(Player *player, GameObject* _GO)
                 pGroupie->GetMap() == _GO->GetMap())
                 pGroupie->CastSpell(pGroupie,SPELL_BARON_ULTIMATUM,true);
         }
-    } else if (player->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE &&
-                !player->HasAura(SPELL_BARON_ULTIMATUM) &&
-                player->GetMap() == _GO->GetMap())
-                player->CastSpell(player,SPELL_BARON_ULTIMATUM,true);
+    } else if (pPlayer->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE &&
+                !pPlayer->HasAura(SPELL_BARON_ULTIMATUM) &&
+                pPlayer->GetMap() == _GO->GetMap())
+                pPlayer->CastSpell(pPlayer,SPELL_BARON_ULTIMATUM,true);
 
     pInstance->SetData(TYPE_BARON_RUN,IN_PROGRESS);
     return false;
diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp
index 081c83e5977..d09ab431b07 100644
--- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp
+++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_brutallus.cpp
@@ -105,17 +105,17 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
         m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
         Madrigosa = Unit::GetUnit(*m_creature, pInstance->GetData64(DATA_MADRIGOSA));
         //Creature* boss = Unit::GetCreature((*m_creature),AzgalorGUID);
-        if(!Madrigosa) error_log("Madrigosa ist nicht zu finden");
+        if (!Madrigosa) error_log("Madrigosa ist nicht zu finden");
 
-        if(Intro && Madrigosa){
-            if(!Madrigosa->isAlive())
+        if (Intro && Madrigosa){
+            if (!Madrigosa->isAlive())
                 EndIntro();
             else error_log("Madrigosa is Tod");
         }
         else
             EndIntro();
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_BRUTALLUS_EVENT, NOT_STARTED);
     }
 
@@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
     {
         DoScriptText(YELL_AGGRO, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_BRUTALLUS_EVENT, IN_PROGRESS);
     }
 
@@ -141,7 +141,7 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
     {
         DoScriptText(YELL_DEATH, m_creature);
 
-        if(pInstance){
+        if (pInstance){
             pInstance->SetData(DATA_BRUTALLUS_EVENT, DONE);
             float x,y,z;
             m_creature->GetPosition(x,y,z);
@@ -151,9 +151,9 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
 
     void StartIntro()
     {
-        if(!Intro)
+        if (!Intro)
             return;
-        if(Madrigosa){
+        if (Madrigosa){
             Madrigosa->setDeathState(ALIVE);
             Madrigosa->setActive(true);
             IsIntro = true;
@@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
 
     void DoIntro()
     {
-        if(!Madrigosa)
+        if (!Madrigosa)
             return;
 
         switch(IntroPhase)
@@ -246,24 +246,24 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
     }
 
     void MoveInLineOfSight(Unit *who){
-        if(pInstance && Intro)
+        if (pInstance && Intro)
             pInstance->SetData(DATA_BRUTALLUS_EVENT, SPECIAL);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(Intro && !IsIntro)
+        if (Intro && !IsIntro)
             StartIntro();
 
-        if(IsIntro)
+        if (IsIntro)
         {
-            if(IntroPhaseTimer < diff){
+            if (IntroPhaseTimer < diff){
                 DoIntro();
             }else IntroPhaseTimer -= diff;
 
-            if(IntroPhase == 3 + 1){
-                if(IntroFrostBoltTimer < diff){
-                    if(Madrigosa){
+            if (IntroPhase == 3 + 1){
+                if (IntroFrostBoltTimer < diff){
+                    if (Madrigosa){
                         Madrigosa->CastSpell(m_creature, SPELL_INTRO_FROSTBOLT, false);
                         IntroFrostBoltTimer = 2000;
                     }
@@ -271,16 +271,16 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
             }
         }
 
-        if(!UpdateVictim() || IsIntro)
+        if (!UpdateVictim() || IsIntro)
             return;
 
-        if(SlashTimer < diff)
+        if (SlashTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_METEOR_SLASH);
             SlashTimer = 11000;
         }else SlashTimer -= diff;
 
-        if(StompTimer < diff)
+        if (StompTimer < diff)
         {
             switch(rand()%3)
             {
@@ -292,14 +292,14 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
             StompTimer = 30000;
         }else StompTimer -= diff;
 
-        if(BurnTimer < diff)
+        if (BurnTimer < diff)
         {
-            if(Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 target->CastSpell(target, SPELL_BURN, true);
             BurnTimer = 60000;
         }else BurnTimer -= diff;
 
-        if(BerserkTimer < diff && !Enraged)
+        if (BerserkTimer < diff && !Enraged)
         {
             DoScriptText(YELL_BERSERK, m_creature);
             DoCast(m_creature, SPELL_BERSERK);
diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp
index 38d79ec8e55..2e215d3de05 100644
--- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp
+++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp
@@ -113,7 +113,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
     {
         Enraged = false;
 
-        if(pInstance)
+        if (pInstance)
         {
             Unit* Temp =  Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_ALYTHESS));
             if (Temp)
@@ -122,14 +122,14 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
                     CAST_CRE(Temp)->Respawn();
                 }else
                 {
-                    if(Temp->getVictim())
+                    if (Temp->getVictim())
                     {
                         m_creature->getThreatManager().addThreat(Temp->getVictim(),0.0f);
                     }
                 }
         }
 
-        if(!m_creature->isInCombat())
+        if (!m_creature->isInCombat())
         {
             ShadowbladesTimer = 10000;
             ShadownovaTimer = 30000;
@@ -141,7 +141,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
             SisterDeath = false;
         }
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED);
     }
     
@@ -149,20 +149,20 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
     {
         DoZoneInCombat();
 
-        if(pInstance)
+        if (pInstance)
         {
             Unit* Temp =  Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_ALYTHESS));
             if (Temp && Temp->isAlive() && !(Temp->getVictim()))
                 CAST_CRE(Temp)->AI()->AttackStart(who);
         }
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS);
     }
 
     void KilledUnit(Unit *victim)
     {
-        if(rand()%4 == 0)
+        if (rand()%4 == 0)
         {
             switch (rand()%2)
             {
@@ -179,7 +179,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
         {
             DoScriptText(SAY_SAC_DEAD, m_creature);
 
-            if(pInstance)
+            if (pInstance)
                 pInstance->SetData(DATA_EREDAR_TWINS_EVENT, DONE);
         }
         else
@@ -207,9 +207,9 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
         switch(TouchedType)
         {
         case SPELL_FLAME_TOUCHED:
-            if(!target->HasAura(SPELL_DARK_FLAME))
+            if (!target->HasAura(SPELL_DARK_FLAME))
             {
-                if(target->HasAura(SPELL_DARK_TOUCHED))
+                if (target->HasAura(SPELL_DARK_TOUCHED))
                 {
                     target->RemoveAurasDueToSpell(SPELL_DARK_TOUCHED);
                     target->CastSpell(target, SPELL_DARK_FLAME, true);
@@ -217,9 +217,9 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
             }
             break;
         case SPELL_DARK_TOUCHED:
-            if(!target->HasAura(SPELL_DARK_FLAME))
+            if (!target->HasAura(SPELL_DARK_FLAME))
             {
-                if(target->HasAura(SPELL_FLAME_TOUCHED))
+                if (target->HasAura(SPELL_FLAME_TOUCHED))
                 {
                     target->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED);
                     target->CastSpell(target, SPELL_DARK_FLAME, true);
@@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!SisterDeath)
+        if (!SisterDeath)
         {
             if (pInstance)
             {
@@ -250,7 +250,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(SisterDeath)
+        if (SisterDeath)
         {
             if (ConflagrationTimer < diff)
             {
@@ -259,7 +259,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
                     m_creature->InterruptSpell(CURRENT_GENERIC_SPELL);
                     Unit* target = NULL;
                     target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                    if(target)
+                    if (target)
                         DoCast(target, SPELL_CONFLAGRATION);
                     ConflagrationTimer = 30000+(rand()%5000);
                 }
@@ -267,18 +267,18 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
         }
         else
         {
-            if(ShadownovaTimer < diff)
+            if (ShadownovaTimer < diff)
             {
                 if (!m_creature->IsNonMeleeSpellCasted(false))
                 {
                     Unit* target = NULL;
                     target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                    if(target)
+                    if (target)
                         DoCast(target, SPELL_SHADOW_NOVA);
 
-                    if(!SisterDeath)
+                    if (!SisterDeath)
                     {
-                        if(target)
+                        if (target)
                             DoScriptText(EMOTE_SHADOW_NOVA, m_creature, target);
                         DoScriptText(YELL_SHADOW_NOVA, m_creature);
                     }
@@ -287,19 +287,19 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
             }else ShadownovaTimer -=diff;
         }
 
-        if(ConfoundingblowTimer < diff)
+        if (ConfoundingblowTimer < diff)
         {
             if (!m_creature->IsNonMeleeSpellCasted(false))
             {
                 Unit* target = NULL;
                 target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                if(target)
+                if (target)
                     DoCast(target, SPELL_CONFOUNDING_BLOW);
                 ConfoundingblowTimer = 20000 + (rand()%5000);
             }
         }else ConfoundingblowTimer -=diff;
 
-        if(ShadowimageTimer < diff)
+        if (ShadowimageTimer < diff)
         {
             Unit* target = NULL;
             Creature* temp = NULL;
@@ -307,13 +307,13 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
             {
                 target = SelectUnit(SELECT_TARGET_RANDOM, 0);
                 temp = DoSpawnCreature(MOB_SHADOW_IMAGE,0,0,0,0,TEMPSUMMON_CORPSE_DESPAWN,10000);
-                if(temp && target)
+                if (temp && target)
                     temp->AI()->AttackStart(target);
             }
             ShadowimageTimer = 20000;
         }else ShadowimageTimer -=diff;
 
-        if(ShadowbladesTimer < diff)
+        if (ShadowbladesTimer < diff)
         {
             if (!m_creature->IsNonMeleeSpellCasted(false))
             {
@@ -330,10 +330,10 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
             Enraged = true;
         }else EnrageTimer -= diff;
 
-        if( m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
+        if (m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
         {
             //If we are within range melee the target
-            if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
+            if (m_creature->IsWithinMeleeRange(m_creature->getVictim()))
             {
                 HandleTouchedSpells(m_creature->getVictim(), SPELL_DARK_TOUCHED);
                 m_creature->AttackerStateUpdate(m_creature->getVictim());
@@ -374,7 +374,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
     {
         Enraged = false;
 
-        if(pInstance)
+        if (pInstance)
         {
             Unit* Temp =  Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_SACROLASH));
             if (Temp)
@@ -383,14 +383,14 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
                     CAST_CRE(Temp)->Respawn();
                 }else
                 {
-                    if(Temp->getVictim())
+                    if (Temp->getVictim())
                     {
                         m_creature->getThreatManager().addThreat(Temp->getVictim(),0.0f);
                     }
                 }
         }
 
-        if(!m_creature->isInCombat())
+        if (!m_creature->isInCombat())
         {
             ConflagrationTimer = 45000;
             BlazeTimer = 100;
@@ -403,7 +403,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
             SisterDeath = false;
         }
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED);
     }
     
@@ -411,14 +411,14 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
     {
         DoZoneInCombat();
 
-        if(pInstance)
+        if (pInstance)
         {
             Unit* Temp =  Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_SACROLASH));
             if (Temp && Temp->isAlive() && !(Temp->getVictim()))
                 CAST_CRE(Temp)->AI()->AttackStart(who);
         }
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS);
     }
 
@@ -447,7 +447,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
                 }
             }
         }
-        else if (IntroStepCounter == 10 && m_creature->IsWithinLOSInMap(who)&& m_creature->IsWithinDistInMap(who, 30) )
+        else if (IntroStepCounter == 10 && m_creature->IsWithinLOSInMap(who)&& m_creature->IsWithinDistInMap(who, 30))
         {
             IntroStepCounter = 0;
         }
@@ -455,7 +455,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
 
     void KilledUnit(Unit *victim)
     {
-        if(rand()%4 == 0)
+        if (rand()%4 == 0)
         {
             switch (rand()%2)
             {
@@ -471,7 +471,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
         {
             DoScriptText(YELL_ALY_DEAD, m_creature);
 
-            if(pInstance)
+            if (pInstance)
                 pInstance->SetData(DATA_EREDAR_TWINS_EVENT, DONE);
         }
         else
@@ -500,9 +500,9 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
         switch(TouchedType)
         {
         case SPELL_FLAME_TOUCHED:
-            if(!target->HasAura(SPELL_DARK_FLAME))
+            if (!target->HasAura(SPELL_DARK_FLAME))
             {
-                if(target->HasAura(SPELL_DARK_TOUCHED))
+                if (target->HasAura(SPELL_DARK_TOUCHED))
                 {
                     target->RemoveAurasDueToSpell(SPELL_DARK_TOUCHED);
                     target->CastSpell(target, SPELL_DARK_FLAME, true);
@@ -513,9 +513,9 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
             }
             break;
         case SPELL_DARK_TOUCHED:
-            if(!target->HasAura(SPELL_DARK_FLAME))
+            if (!target->HasAura(SPELL_DARK_FLAME))
             {
-                if(target->HasAura(SPELL_FLAME_TOUCHED))
+                if (target->HasAura(SPELL_FLAME_TOUCHED))
                 {
                     target->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED);
                     target->CastSpell(target, SPELL_DARK_FLAME, true);
@@ -532,22 +532,22 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
         {
         case 0: return 0;
         case 1:
-            if(Sacrolash)
+            if (Sacrolash)
                 DoScriptText(YELL_INTRO_SAC_1, Sacrolash);
             return 1000;
         case 2: DoScriptText(YELL_INTRO_ALY_2, m_creature); return 1000;
         case 3:
-            if(Sacrolash)
+            if (Sacrolash)
                 DoScriptText(YELL_INTRO_SAC_3, Sacrolash);
             return 2000;
         case 4: DoScriptText(YELL_INTRO_ALY_4, m_creature); return 1000;
         case 5:
-            if(Sacrolash)
+            if (Sacrolash)
                 DoScriptText(YELL_INTRO_SAC_5, Sacrolash);
             return 2000;
         case 6: DoScriptText(YELL_INTRO_ALY_6, m_creature); return 1000;
         case 7:
-            if(Sacrolash)
+            if (Sacrolash)
                 DoScriptText(YELL_INTRO_SAC_7, Sacrolash);
             return 3000;
         case 8: DoScriptText(YELL_INTRO_ALY_8, m_creature); return 900000;
@@ -557,15 +557,15 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(IntroStepCounter < 9)
+        if (IntroStepCounter < 9)
         {
-            if(IntroYellTimer < diff)
+            if (IntroYellTimer < diff)
             {
                 IntroYellTimer = IntroStep(++IntroStepCounter);
             }else IntroYellTimer -= diff;
         }
 
-        if(!SisterDeath)
+        if (!SisterDeath)
         {
             if (pInstance)
             {
@@ -584,15 +584,15 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
         if (!UpdateVictim())
             return;
 
-        if(SisterDeath)
+        if (SisterDeath)
         {
-            if(ShadownovaTimer < diff)
+            if (ShadownovaTimer < diff)
             {
                 if (!m_creature->IsNonMeleeSpellCasted(false))
                 {
                     Unit* target = NULL;
                     target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                    if(target)
+                    if (target)
                         DoCast(target, SPELL_SHADOW_NOVA);
                     ShadownovaTimer= 30000+(rand()%5000);
                 }
@@ -600,20 +600,20 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
         }
         else
         {
-            if(ConflagrationTimer < diff)
+            if (ConflagrationTimer < diff)
             {
                 if (!m_creature->IsNonMeleeSpellCasted(false))
                 {
                     m_creature->InterruptSpell(CURRENT_GENERIC_SPELL);
                     Unit* target = NULL;
                     target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                    if(target)
+                    if (target)
                         DoCast(target, SPELL_CONFLAGRATION);
                     ConflagrationTimer = 30000+(rand()%5000);
 
-                    if(!SisterDeath)
+                    if (!SisterDeath)
                     {
-                        if(target)
+                        if (target)
                             DoScriptText(EMOTE_CONFLAGRATION, m_creature, target);
                         DoScriptText(YELL_CANFLAGRATION, m_creature);
                     }
@@ -623,9 +623,9 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
             }else ConflagrationTimer -= diff;
         }
 
-        if(FlamesearTimer < diff)
+        if (FlamesearTimer < diff)
         {
-            if(!m_creature->IsNonMeleeSpellCasted(false))
+            if (!m_creature->IsNonMeleeSpellCasted(false))
             {
                 DoCast(m_creature, SPELL_FLAME_SEAR);
                 FlamesearTimer = 15000;
@@ -634,7 +634,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
 
         if (PyrogenicsTimer < diff)
         {
-            if(!m_creature->IsNonMeleeSpellCasted(false))
+            if (!m_creature->IsNonMeleeSpellCasted(false))
             {
                 DoCast(m_creature, SPELL_PYROGENICS,true);
                 PyrogenicsTimer = 15000;
@@ -643,7 +643,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
 
         if (BlazeTimer < diff)
         {
-            if(!m_creature->IsNonMeleeSpellCasted(false))
+            if (!m_creature->IsNonMeleeSpellCasted(false))
             {
                 DoCast(m_creature->getVictim(), SPELL_BLAZE);
                 BlazeTimer = 3800;
@@ -689,9 +689,9 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI
 
         case SPELL_SHADOW_FURY:
         case SPELL_DARK_STRIKE:
-            if(!target->HasAura(SPELL_DARK_FLAME))
+            if (!target->HasAura(SPELL_DARK_FLAME))
             {
-                if(target->HasAura(SPELL_FLAME_TOUCHED))
+                if (target->HasAura(SPELL_FLAME_TOUCHED))
                 {
                     target->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED);
                     target->CastSpell(target, SPELL_DARK_FLAME, true);
@@ -703,10 +703,10 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->HasAura(SPELL_IMAGE_VISUAL))
+        if (!m_creature->HasAura(SPELL_IMAGE_VISUAL))
             DoCast(m_creature, SPELL_IMAGE_VISUAL);
 
-        if(KillTimer < diff)
+        if (KillTimer < diff)
         {
             m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
             KillTimer = 9999999;
@@ -715,18 +715,18 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(ShadowfuryTimer < diff)
+        if (ShadowfuryTimer < diff)
         {
             DoCast(m_creature, SPELL_SHADOW_FURY);
             ShadowfuryTimer = 10000;
         }else ShadowfuryTimer -=diff;
 
-        if(DarkstrikeTimer < diff)
+        if (DarkstrikeTimer < diff)
         {
-            if(!m_creature->IsNonMeleeSpellCasted(false))
+            if (!m_creature->IsNonMeleeSpellCasted(false))
             {
                 //If we are within range melee the target
-                if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
+                if (m_creature->IsWithinMeleeRange(m_creature->getVictim()))
                     DoCast(m_creature->getVictim(), SPELL_DARK_STRIKE);
             }
             DarkstrikeTimer = 3000;
diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp
index 15d3614c285..f4bd81a7b94 100644
--- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp
+++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp
@@ -131,13 +131,13 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
 
         // wait for core patch be accepted
         /*SpellEntry *TempSpell = GET_SPELL(SPELL_ENCAPSULATE_EFFECT);
-        if(TempSpell->SpellIconID == 2294)
+        if (TempSpell->SpellIconID == 2294)
             TempSpell->SpellIconID = 2295;
         TempSpell = GET_SPELL(SPELL_VAPOR_TRIGGER);
-        if((TempSpell->Attributes & SPELL_ATTR_PASSIVE) == 0)
+        if ((TempSpell->Attributes & SPELL_ATTR_PASSIVE) == 0)
             TempSpell->Attributes |= SPELL_ATTR_PASSIVE;
         TempSpell = GET_SPELL(SPELL_FOG_CHARM2);
-        if((TempSpell->Attributes & SPELL_ATTR_PASSIVE) == 0)
+        if ((TempSpell->Attributes & SPELL_ATTR_PASSIVE) == 0)
             TempSpell->Attributes |= SPELL_ATTR_PASSIVE;*/
     }
 
@@ -165,7 +165,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
         DespawnSummons(MOB_VAPOR_TRAIL);
         m_creature->setActive(false);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_FELMYST_EVENT, NOT_STARTED);
     }
 
@@ -177,19 +177,19 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
         m_creature->CastSpell(m_creature, AURA_NOXIOUS_FUMES, true);
         EnterPhase(PHASE_GROUND);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_FELMYST_EVENT, IN_PROGRESS);
     }
 
     void AttackStart(Unit *who)
     {
-        if(Phase != PHASE_FLIGHT)
+        if (Phase != PHASE_FLIGHT)
             ScriptedAI::AttackStart(who);
     }
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(Phase != PHASE_FLIGHT)
+        if (Phase != PHASE_FLIGHT)
             ScriptedAI::MoveInLineOfSight(who);
     }
 
@@ -211,24 +211,24 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
     {
         DoScriptText(YELL_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_FELMYST_EVENT, DONE);
     }
 
     void SpellHit(Unit *caster, const SpellEntry *spell)
     {
         // workaround for linked aura
-        /*if(spell->Id == SPELL_VAPOR_FORCE)
+        /*if (spell->Id == SPELL_VAPOR_FORCE)
         {
             caster->CastSpell(caster, SPELL_VAPOR_TRIGGER, true);
         }*/
         // workaround for mind control
-        if(spell->Id == SPELL_FOG_INFORM)
+        if (spell->Id == SPELL_FOG_INFORM)
         {
             float x, y, z;
             caster->GetPosition(x, y, z);
             Unit* summon = m_creature->SummonCreature(MOB_DEAD, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-            if(summon)
+            if (summon)
             {
                 summon->SetMaxHealth(caster->GetMaxHealth());
                 summon->SetHealth(caster->GetMaxHealth());
@@ -241,7 +241,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
 
     void JustSummoned(Creature *summon)
     {
-        if(summon->GetEntry() == MOB_DEAD)
+        if (summon->GetEntry() == MOB_DEAD)
         {
             summon->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
             DoZoneInCombat(summon);
@@ -256,7 +256,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
 
     void DamageTaken(Unit*, uint32 &damage)
     {
-        if(Phase != PHASE_GROUND && damage >= m_creature->GetHealth())
+        if (Phase != PHASE_GROUND && damage >= m_creature->GetHealth())
             damage = 0;
     }
 
@@ -307,11 +307,11 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
             error_log("Summon Vapor case 2");
             Unit* target;
             target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true);
-            if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
-            if(target)
+            if (!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
+            if (target)
             {
                 Creature* Vapor = m_creature->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000);
-                if(Vapor)
+                if (Vapor)
                 {
                     Vapor->AI()->AttackStart(target);
                     m_creature->InterruptNonMeleeSpells(false);
@@ -332,12 +332,12 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
             //m_creature->CastSpell(m_creature, SPELL_VAPOR_SELECT); need core support
             Unit* target;
             target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true);
-            if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
-            if(target)
+            if (!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
+            if (target)
             {
                 //target->CastSpell(target, SPELL_VAPOR_SUMMON, true); need core support
                 Creature* Vapor = m_creature->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000);
-                if(Vapor)
+                if (Vapor)
                 {
                     Vapor->AI()->AttackStart(target);
                     m_creature->InterruptNonMeleeSpells(false);
@@ -359,8 +359,8 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
         case 5:{
             Unit* target;
             target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true);
-            if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
-            if(target)
+            if (!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
+            if (target)
             {
                 BreathX = target->GetPositionX();
                 BreathY = target->GetPositionY();
@@ -397,10 +397,10 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
             BreathCount++;
             Timer[EVENT_SUMMON_FOG] = 0;
             Timer[EVENT_FLIGHT_SEQUENCE] = 1;
-            if(BreathCount < 3) FlightCount = 4;
+            if (BreathCount < 3) FlightCount = 4;
             break;
         case 9:
-            if(Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO, 0))
+            if (Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO, 0))
             {
                 float x, y, z;
                 target->GetContactPoint(m_creature, x, y, z);
@@ -430,7 +430,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
     {
         if (!UpdateVictim())
         {
-            if(Phase == PHASE_FLIGHT && !m_creature->IsInEvadeMode())
+            if (Phase == PHASE_FLIGHT && !m_creature->IsInEvadeMode())
                 EnterEvadeMode();
             return;
         }
@@ -438,18 +438,18 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
         Event = EVENT_NULL;
         for(uint32 i = 1; i <= MaxTimer[Phase]; ++i)
         {
-            if(Timer[i])
-                if(Timer[i] <= diff)
+            if (Timer[i])
+                if (Timer[i] <= diff)
                 {
-                    if(!Event)
+                    if (!Event)
                         Event = (EventFelmyst)i;
                 }else Timer[i] -= diff;
         }
 
-        if(m_creature->IsNonMeleeSpellCasted(false))
+        if (m_creature->IsNonMeleeSpellCasted(false))
             return;
 
-        if(Phase == PHASE_GROUND)
+        if (Phase == PHASE_GROUND)
         {
             switch(Event)
             {
@@ -471,7 +471,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
                 Timer[EVENT_GAS_NOVA] = 20000 + rand()%5 * 1000;
                 break;
             case EVENT_ENCAPSULATE:
-                if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true))
+                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true))
                 {
                     m_creature->CastSpell(target, SPELL_ENCAPSULATE_CHANNEL, false);
                     Timer[EVENT_ENCAPSULATE] = 25000 + rand()%5 * 1000;
@@ -485,7 +485,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
             }
         }
 
-        if(Phase == PHASE_FLIGHT)
+        if (Phase == PHASE_FLIGHT)
         {
             switch(Event)
             {
@@ -502,7 +502,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
                     float x, y, z;
                     m_creature->GetPosition(x, y, z);
                     m_creature->UpdateGroundPositionZ(x, y, z);
-                    if(Creature *Fog = m_creature->SummonCreature(MOB_VAPOR_TRAIL, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 10000))
+                    if (Creature *Fog = m_creature->SummonCreature(MOB_VAPOR_TRAIL, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN, 10000))
                     {
                         Fog->RemoveAurasDueToSpell(SPELL_TRAIL_TRIGGER);
                         Fog->CastSpell(Fog, SPELL_FOG_TRIGGER, true);
@@ -539,14 +539,14 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
 
         for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
         {
-            if(entry == MOB_VAPOR_TRAIL && Phase == PHASE_FLIGHT)
+            if (entry == MOB_VAPOR_TRAIL && Phase == PHASE_FLIGHT)
             {
                 (*i)->GetPosition(x, y, z);
                 m_creature->SummonCreature(MOB_DEAD, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
             }
             (*i)->SetVisibility(VISIBILITY_OFF);
             (*i)->setDeathState(JUST_DIED);
-            if((*i)->getDeathState() == CORPSE)
+            if ((*i)->getDeathState() == CORPSE)
                 (*i)->RemoveCorpse();
         }
     }
@@ -567,7 +567,7 @@ struct TRINITY_DLL_DECL mob_felmyst_vaporAI : public ScriptedAI
     }
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->getVictim())
+        if (!m_creature->getVictim())
             AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
     }
 };
diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp
index d4b4a7b50b8..981f067bd01 100644
--- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp
+++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp
@@ -127,17 +127,17 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
         {
             SathGUID = pInstance->GetData64(DATA_SATHROVARR);
             DoorGUID = pInstance->GetData64(DATA_GO_FORCEFIELD);
             
-            if(GameObject *Door = pInstance->instance->GetGameObject(pInstance->GetData64(DoorGUID)))
+            if (GameObject *Door = pInstance->instance->GetGameObject(pInstance->GetData64(DoorGUID)))
                 Door->SetLootState(GO_JUST_DEACTIVATED);
         }
 
         Unit *Sath = Unit::GetUnit(*m_creature,SathGUID);
-        if(Sath) CAST_CRE(Sath)->AI()->EnterEvadeMode();
+        if (Sath) CAST_CRE(Sath)->AI()->EnterEvadeMode();
 
         m_creature->setFaction(14);
         m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_SELECTABLE);
@@ -161,7 +161,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(damage >= m_creature->GetHealth() && done_by != m_creature)
+        if (damage >= m_creature->GetHealth() && done_by != m_creature)
             damage = 0;
     }
 
@@ -169,11 +169,11 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI
     {
         m_creature->SetStandState(UNIT_STAND_STATE_STAND);
         DoScriptText(SAY_EVIL_AGGRO, m_creature);
-        if(GameObject *Door = pInstance->instance->GetGameObject(pInstance->GetData64(DoorGUID)))
+        if (GameObject *Door = pInstance->instance->GetGameObject(pInstance->GetData64(DoorGUID)))
             Door->SetLootState(GO_ACTIVATED);
         DoZoneInCombat();
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_KALECGOS_EVENT, IN_PROGRESS);
     }
 
@@ -189,7 +189,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI
     void MovementInform(uint32 type,uint32 id)
     {
         m_creature->SetVisibility(VISIBILITY_OFF);
-        if(isFriendly)
+        if (isFriendly)
             m_creature->setDeathState(JUST_DIED);
         else
         {
@@ -271,12 +271,12 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             KalecgosGUID = pInstance->GetData64(DATA_KALECGOS_DRAGON);
 
-        if(KalecGUID)
+        if (KalecGUID)
         {
-            if(Unit* Kalec = Unit::GetUnit(*m_creature, KalecGUID))
+            if (Unit* Kalec = Unit::GetUnit(*m_creature, KalecGUID))
                 Kalec->setDeathState(JUST_DIED);
             KalecGUID = 0;
         }
@@ -289,14 +289,14 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
         isEnraged = false;
         isBanished = false;
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_KALECGOS_EVENT, NOT_STARTED);
     }
 
     void EnterCombat(Unit* who)
     {
         Creature *Kalec = m_creature->SummonCreature(MOB_KALEC, m_creature->GetPositionX() + 10, m_creature->GetPositionY() + 5, m_creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0);
-        if(Kalec)
+        if (Kalec)
         {
             KalecGUID = Kalec->GetGUID();
             m_creature->CombatStart(Kalec);
@@ -307,16 +307,16 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(damage >= m_creature->GetHealth() && done_by != m_creature)
+        if (damage >= m_creature->GetHealth() && done_by != m_creature)
             damage = 0;
     }
 
     void KilledUnit(Unit *target)
     {
-        if(target->GetGUID() == KalecGUID)
+        if (target->GetGUID() == KalecGUID)
         {
             TeleportAllPlayersBack();
-            if(Unit *Kalecgos = Unit::GetUnit(*m_creature, KalecgosGUID))
+            if (Unit *Kalecgos = Unit::GetUnit(*m_creature, KalecgosGUID))
             {
                 CAST_AI(boss_kalecgosAI, CAST_CRE(Kalecgos)->AI())->TalkTimer = 1;
                 CAST_AI(boss_kalecgosAI, CAST_CRE(Kalecgos)->AI())->isFriendly = false;
@@ -336,25 +336,25 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
         DoScriptText(SAY_SATH_DEATH, m_creature);
         m_creature->GetMap()->CreatureRelocation(m_creature, m_creature->GetPositionX(), m_creature->GetPositionY(), DRAGON_REALM_Z, m_creature->GetOrientation());
         TeleportAllPlayersBack();
-        if(Unit *Kalecgos = Unit::GetUnit(*m_creature, KalecgosGUID))
+        if (Unit *Kalecgos = Unit::GetUnit(*m_creature, KalecgosGUID))
         {
             CAST_AI(boss_kalecgosAI, CAST_CRE(Kalecgos)->AI())->TalkTimer = 1;
             CAST_AI(boss_kalecgosAI, CAST_CRE(Kalecgos)->AI())->isFriendly = true;
         }
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_KALECGOS_EVENT, DONE);
     }
 
     void TeleportAllPlayersBack()
     {
-        Map *map = m_creature->GetMap();
-        if(!map->IsDungeon()) return;
-        Map::PlayerList const &PlayerList = map->GetPlayers();
+        Map* pMap = m_creature->GetMap();
+        if (!pMap->IsDungeon()) return;
+        Map::PlayerList const &PlayerList = pMap->GetPlayers();
         Map::PlayerList::const_iterator i;
         for(i = PlayerList.begin(); i != PlayerList.end(); ++i)
-            if(Player* i_pl = i->getSource())
-                if(i_pl->HasAura(AURA_SPECTRAL_REALM))
+            if (Player* i_pl = i->getSource())
+                if (i_pl->HasAura(AURA_SPECTRAL_REALM))
                     i_pl->RemoveAurasDueToSpell(AURA_SPECTRAL_REALM);
     }
 
@@ -363,12 +363,12 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(CheckTimer < diff)
+        if (CheckTimer < diff)
         {
             if (((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 10) && !isEnraged)
             {
                 Unit* Kalecgos = Unit::GetUnit(*m_creature, KalecgosGUID);
-                if(Kalecgos)
+                if (Kalecgos)
                 {
                     Kalecgos->CastSpell(Kalecgos, SPELL_ENRAGE, true);
                     CAST_AI(boss_kalecgosAI, CAST_CRE(Kalecgos)->AI())->isEnraged = true;
@@ -377,11 +377,11 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
                 isEnraged = true;
             }
 
-            if(!isBanished && (m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 1)
+            if (!isBanished && (m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 1)
             {
-                if(Unit *Kalecgos = Unit::GetUnit(*m_creature, KalecgosGUID))
+                if (Unit *Kalecgos = Unit::GetUnit(*m_creature, KalecgosGUID))
                 {
-                    if(CAST_AI(boss_kalecgosAI, CAST_CRE(Kalecgos)->AI())->isBanished)
+                    if (CAST_AI(boss_kalecgosAI, CAST_CRE(Kalecgos)->AI())->isBanished)
                     {
                         m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                         return;
@@ -402,13 +402,13 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
             CheckTimer = 1000;
         }else CheckTimer -= diff;
 
-        if(ResetThreat < diff)
+        if (ResetThreat < diff)
         {
-            if ( ( m_creature->getVictim()->HasAura(AURA_SPECTRAL_EXHAUSTION)) && (m_creature->getVictim()->GetTypeId() == TYPEID_PLAYER) )
+            if ((m_creature->getVictim()->HasAura(AURA_SPECTRAL_EXHAUSTION)) && (m_creature->getVictim()->GetTypeId() == TYPEID_PLAYER))
             {
                 for(std::list<HostilReference*>::iterator itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr)
                 {
-                    if(((*itr)->getUnitGuid()) ==  (m_creature->getVictim()->GetGUID()))
+                    if (((*itr)->getUnitGuid()) ==  (m_creature->getVictim()->GetGUID()))
                     {
                         (*itr)->removeReference();
                         break;
@@ -418,22 +418,22 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
             ResetThreat = 1000;
         }else ResetThreat -= diff;
 
-        if(ShadowBoltTimer < diff)
+        if (ShadowBoltTimer < diff)
         {
             DoScriptText(SAY_SATH_SPELL1, m_creature);
             DoCast(m_creature, SPELL_SHADOW_BOLT);
             ShadowBoltTimer = 7000+(rand()%3000);
         }else ShadowBoltTimer -= diff;
 
-        if(AgonyCurseTimer < diff)
+        if (AgonyCurseTimer < diff)
         {
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-            if(!target) target = m_creature->getVictim();
+            if (!target) target = m_creature->getVictim();
             DoCast(target, SPELL_AGONY_CURSE);
             AgonyCurseTimer = 20000;
         }else AgonyCurseTimer -= diff;
 
-        if(CorruptionStrikeTimer < diff)
+        if (CorruptionStrikeTimer < diff)
         {
             DoScriptText(SAY_SATH_SPELL2, m_creature);
             DoCast(m_creature->getVictim(), SPELL_CORRUPTION_STRIKE);
@@ -463,7 +463,7 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             SathGUID = pInstance->GetData64(DATA_SATHROVARR);
 
         RevitalizeTimer = 5000;
@@ -478,9 +478,9 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(done_by->GetGUID() != SathGUID)
+        if (done_by->GetGUID() != SathGUID)
             damage = 0;
-        else if(isEnraged)
+        else if (isEnraged)
             damage *= 3;
     }
 
@@ -489,7 +489,7 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(YellTimer < diff)
+        if (YellTimer < diff)
         {
             switch(YellSequence)
             {
@@ -498,14 +498,14 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI
                 YellSequence++;
                 break;
             case 1:
-                if((m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 50)
+                if ((m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 50)
                 {
                     DoScriptText(SAY_GOOD_NEAR_DEATH, m_creature);
                     YellSequence++;
                 }
                 break;
             case 2:
-                if((m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 10)
+                if ((m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 10)
                 {
                     DoScriptText(SAY_GOOD_NEAR_DEATH2, m_creature);
                     YellSequence++;
@@ -517,13 +517,13 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI
             YellTimer = 5000;
         }
 
-        if(RevitalizeTimer < diff)
+        if (RevitalizeTimer < diff)
         {
             DoCast(m_creature, SPELL_REVITALIZE);
             RevitalizeTimer = 5000;
         }else RevitalizeTimer -= diff;
 
-        if(HeroicStrikeTimer < diff)
+        if (HeroicStrikeTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_HEROIC_STRIKE);
             HeroicStrikeTimer = 2000;
@@ -535,22 +535,22 @@ struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI
 
 void boss_kalecgosAI::UpdateAI(const uint32 diff)
 {
-    if(TalkTimer)
+    if (TalkTimer)
     {
-        if(!TalkSequence)
+        if (!TalkSequence)
         {
             m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE + UNIT_FLAG_NOT_SELECTABLE);
             m_creature->InterruptNonMeleeSpells(true);
             m_creature->RemoveAllAuras();
             m_creature->DeleteThreatList();
             m_creature->CombatStop();
-            if(GameObject *Door = pInstance->instance->GetGameObject(pInstance->GetData64(DoorGUID)))
+            if (GameObject *Door = pInstance->instance->GetGameObject(pInstance->GetData64(DoorGUID)))
                 Door->SetLootState(GO_JUST_DEACTIVATED);
             TalkSequence++;
         }
-        if(TalkTimer <= diff)
+        if (TalkTimer <= diff)
         {
-            if(isFriendly)
+            if (isFriendly)
                 GoodEnding();
             else
                 BadEnding();
@@ -562,12 +562,12 @@ void boss_kalecgosAI::UpdateAI(const uint32 diff)
         if (!UpdateVictim())
             return;
 
-        if(CheckTimer < diff)
+        if (CheckTimer < diff)
          {
              if (((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 10) && !isEnraged)
              {
                  Unit* Sath = Unit::GetUnit(*m_creature, SathGUID);
-                 if(Sath)
+                 if (Sath)
                  {
                      Sath->CastSpell(Sath, SPELL_ENRAGE, true);
                      CAST_AI(boss_sathrovarrAI, CAST_CRE(Sath)->AI())->isEnraged = true;
@@ -576,11 +576,11 @@ void boss_kalecgosAI::UpdateAI(const uint32 diff)
                  isEnraged = true;
              }
 
-             if(!isBanished && (m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 1)
+             if (!isBanished && (m_creature->GetHealth()*100)/m_creature->GetMaxHealth() < 1)
              {
-                 if(Unit *Sath = Unit::GetUnit(*m_creature, SathGUID))
+                 if (Unit *Sath = Unit::GetUnit(*m_creature, SathGUID))
                  {
-                     if(CAST_AI(boss_sathrovarrAI, CAST_CRE(Sath)->AI())->isBanished)
+                     if (CAST_AI(boss_sathrovarrAI, CAST_CRE(Sath)->AI())->isBanished)
                      {
                          Sath->DealDamage(Sath, Sath->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                          return;
@@ -601,35 +601,35 @@ void boss_kalecgosAI::UpdateAI(const uint32 diff)
              CheckTimer = 1000;
         }else CheckTimer -= diff;
 
-        if(ArcaneBuffetTimer < diff)
+        if (ArcaneBuffetTimer < diff)
         {
             DoCastAOE(SPELL_ARCANE_BUFFET);
             ArcaneBuffetTimer = 8000;
         }else ArcaneBuffetTimer -= diff;
 
-        if(FrostBreathTimer < diff)
+        if (FrostBreathTimer < diff)
         {
             DoCastAOE(SPELL_FROST_BREATH);
             FrostBreathTimer = 15000;
         }else FrostBreathTimer -= diff;
 
-        if(TailLashTimer < diff)
+        if (TailLashTimer < diff)
         {
             DoCastAOE(SPELL_TAIL_LASH);
             TailLashTimer = 15000;
         }else TailLashTimer -= diff;
 
-        if(WildMagicTimer < diff)
+        if (WildMagicTimer < diff)
         {
             DoCastAOE(WildMagic[rand()%6]);
             WildMagicTimer = 20000;
         }else WildMagicTimer -= diff;
 
-        if(SpectralBlastTimer < diff)
+        if (SpectralBlastTimer < diff)
         {
             //this is a hack. we need to find a victim without aura in core
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-            if( target && target != m_creature->getVictim() && target->isAlive() && !target->HasAura(AURA_SPECTRAL_EXHAUSTION) )
+            if (target && target != m_creature->getVictim() && target->isAlive() && !target->HasAura(AURA_SPECTRAL_EXHAUSTION))
             {
                 DoCast(target, SPELL_SPECTRAL_BLAST);
                 SpectralBlastTimer = 20000+(rand()%5000);
@@ -644,12 +644,12 @@ void boss_kalecgosAI::UpdateAI(const uint32 diff)
     }
 }
 
-bool GOkalecgos_teleporter(Player *player, GameObject* _GO)
+bool GOkalecgos_teleporter(Player* pPlayer, GameObject* _GO)
 {
-    if(player->HasAura(AURA_SPECTRAL_EXHAUSTION))
-        player->GetSession()->SendNotification(GO_FAILED);
+    if (pPlayer->HasAura(AURA_SPECTRAL_EXHAUSTION))
+        pPlayer->GetSession()->SendNotification(GO_FAILED);
     else
-        player->CastSpell(player, SPELL_TELEPORT_SPECTRAL, true);
+        pPlayer->CastSpell(pPlayer, SPELL_TELEPORT_SPECTRAL, true);
     return true;
 }
 
diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp
index f03b3155ccd..6be1e0c36ad 100644
--- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp
+++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp
@@ -260,32 +260,32 @@ public:
     AllOrbsInGrid() {}
     bool operator() (GameObject* go)
     {
-        if(go->GetEntry() == GAMEOBJECT_ORB_OF_THE_BLUE_DRAGONFLIGHT)
+        if (go->GetEntry() == GAMEOBJECT_ORB_OF_THE_BLUE_DRAGONFLIGHT)
             return true;
         return false;
     }
 };
 
-bool GOHello_go_orb_of_the_blue_flight(Player *plr, GameObject* go)
+bool GOHello_go_orb_of_the_blue_flight(Player* pPlayer, GameObject* go)
 {
-    if(go->GetUInt32Value(GAMEOBJECT_FACTION) == 35){
+    if (go->GetUInt32Value(GAMEOBJECT_FACTION) == 35){
         ScriptedInstance* pInstance = go->GetInstanceData();
         float x,y,z;
         //float dx,dy,dz;
-        go->SummonCreature(CREATURE_POWER_OF_THE_BLUE_DRAGONFLIGHT, plr->GetPositionX(), plr->GetPositionY(), plr->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 121000);
-        plr->CastSpell(plr, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, true);
+        go->SummonCreature(CREATURE_POWER_OF_THE_BLUE_DRAGONFLIGHT, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 121000);
+        pPlayer->CastSpell(pPlayer, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, true);
         go->SetUInt32Value(GAMEOBJECT_FACTION, 0);
-        Creature* Kalec = Unit::GetCreature(*plr, pInstance->GetData64(DATA_KALECGOS_KJ));
+        Creature* Kalec = Unit::GetCreature(*pPlayer, pInstance->GetData64(DATA_KALECGOS_KJ));
         //Kalec->RemoveDynObject(SPELL_RING_OF_BLUE_FLAMES);
         go->GetPosition(x,y,z);
         // this won't work. need rewritten
         /*
         for(uint8 i = 0; i < 4; ++i)
         {
-            if(DynamicObject* Dyn = Kalec->GetDynObject(SPELL_RING_OF_BLUE_FLAMES))
+            if (DynamicObject* Dyn = Kalec->GetDynObject(SPELL_RING_OF_BLUE_FLAMES))
             {
                 Dyn->GetPosition(dx,dy,dz);
-                if(x == dx && dy == y && dz == z)
+                if (x == dx && dy == y && dz == z)
                 {
                     Dyn->Delete();
                     break;
@@ -339,7 +339,7 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
         TypeContainerVisitor<Trinity::GameObjectListSearcher<AllOrbsInGrid>, GridTypeMapContainer> visitor(searcher);
         CellLock<GridReadGuard> cell_lock(cell, pair);
         cell_lock->Visit(cell_lock, visitor, *(m_creature->GetMap()));
-        if(orbList.empty())
+        if (orbList.empty())
             return;
         uint8 i = 0;
         for(std::list<GameObject*>::iterator itr = orbList.begin(); itr != orbList.end(); ++itr, ++i){
@@ -350,18 +350,18 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
     void ResetOrbs(){
         m_creature->RemoveDynObject(SPELL_RING_OF_BLUE_FLAMES);
         for(uint8 i = 0; i < 4; ++i)
-            if(Orb[i]) Orb[i]->SetUInt32Value(GAMEOBJECT_FACTION, 0);
+            if (Orb[i]) Orb[i]->SetUInt32Value(GAMEOBJECT_FACTION, 0);
     }
 
     void EmpowerOrb(bool all)
     {
-        if(!Orb[OrbsEmpowered])
+        if (!Orb[OrbsEmpowered])
             return;
         uint8 random = rand()%3;
-        if(all){
+        if (all){
             m_creature->RemoveDynObject(SPELL_RING_OF_BLUE_FLAMES);
             for(uint8 i = 0; i < 4; ++i){
-                if(!Orb[i]) return;
+                if (!Orb[i]) return;
                 Orb[i]->CastSpell(m_creature, SPELL_RING_OF_BLUE_FLAMES);
                 Orb[i]->SetUInt32Value(GAMEOBJECT_FACTION, 35);
                 Orb[i]->setActive(true);
@@ -376,9 +376,9 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
             Orb[random]->GetPosition(x,y,z);
             for(uint8 i = 0; i < 4; ++i){
                 DynamicObject* Dyn = m_creature->GetDynObject(SPELL_RING_OF_BLUE_FLAMES);
-                if(Dyn){
+                if (Dyn){
                     Dyn->GetPosition(dx,dy,dz);
-                    if(x == dx && dy == y && dz == z){
+                    if (x == dx && dy == y && dz == z){
                         Dyn->Delete();
                         break;
                      }
@@ -401,12 +401,12 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
     }
 
     void UpdateAI(const uint32 diff){
-        if(!Searched){
+        if (!Searched){
             FindOrbs();
             Searched = true;
             }
 
-        if(OrbsEmpowered == 4) OrbsEmpowered = 0;
+        if (OrbsEmpowered == 4) OrbsEmpowered = 0;
     }
 };
 
@@ -479,19 +479,19 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
             TimerIsDeactiveted[i] = status;
         TimerIsDeactiveted[TIMER_KALEC_JOIN] = IsKalecJoined;
 
-        if(WTimer > 0){
+        if (WTimer > 0){
             IsWaiting = true;
             WaitTimer = WTimer;
         }
 
-        if(OrbActivated) TimerIsDeactiveted[TIMER_ORBS_EMPOWER] = true;
-        if(Timer[TIMER_SHADOW_SPIKE] == 0) TimerIsDeactiveted[TIMER_SHADOW_SPIKE] = true;
-        if(Phase == PHASE_SACRIFICE) TimerIsDeactiveted[TIMER_SUMMON_SHILEDORB] = true;
+        if (OrbActivated) TimerIsDeactiveted[TIMER_ORBS_EMPOWER] = true;
+        if (Timer[TIMER_SHADOW_SPIKE] == 0) TimerIsDeactiveted[TIMER_SHADOW_SPIKE] = true;
+        if (Phase == PHASE_SACRIFICE) TimerIsDeactiveted[TIMER_SUMMON_SHILEDORB] = true;
     }
 
     void JustSummoned(Creature* summoned)
     {
-        if(summoned->GetEntry() == CREATURE_ARMAGEDDON_TARGET)
+        if (summoned->GetEntry() == CREATURE_ARMAGEDDON_TARGET)
         {
             summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -506,7 +506,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
     {
         DoScriptText(SAY_KJ_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_KILJAEDEN_EVENT, DONE);
     }
 
@@ -525,9 +525,9 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
         Summons.DespawnAll();
 
         // Reset the controller
-        if(pInstance){
+        if (pInstance){
             Creature* Control = CAST_CRE(Unit::GetUnit(*m_creature, pInstance->GetData64(DATA_KILJAEDEN_CONTROLLER)));
-            if(Control)
+            if (Control)
                 CAST_AI(Scripted_NoMovementAI, Control->AI())->Reset();
         }
     }
@@ -553,18 +553,18 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
             }
             target->GetPosition(x,y,z);
             Creature* SinisterReflection = m_creature->SummonCreature(CREATURE_SINISTER_REFLECTION, x,y,z,0, TEMPSUMMON_CORPSE_DESPAWN, 0);
-            if(SinisterReflection)
+            if (SinisterReflection)
                 SinisterReflection->AI()->AttackStart(target);
         }
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() || Phase < PHASE_NORMAL)
+        if (!UpdateVictim() || Phase < PHASE_NORMAL)
             return;
 
-        if(IsWaiting){
-            if(WaitTimer < diff){
+        if (IsWaiting){
+            if (WaitTimer < diff){
                 IsWaiting = false;
                 ChangeTimers(false, 0);
             }
@@ -572,37 +572,37 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
         }
 
         for(uint8 t = 0; t < ActiveTimers; ++t){
-            if(Timer[t] < diff && !TimerIsDeactiveted[t]){
+            if (Timer[t] < diff && !TimerIsDeactiveted[t]){
                 switch(t){
                     case TIMER_KALEC_JOIN:
-                        if(Kalec){
+                        if (Kalec){
                             DoScriptText(SAY_KALECGOS_JOIN, Kalec);
                             IsKalecJoined = true;
                             TimerIsDeactiveted[TIMER_KALEC_JOIN] = true;
                         }
                         break;
                     case TIMER_SOUL_FLAY:
-                        if(!m_creature->IsNonMeleeSpellCasted(false)){
+                        if (!m_creature->IsNonMeleeSpellCasted(false)){
                         m_creature->CastSpell(m_creature->getVictim(), SPELL_SOUL_FLAY, false);
                         m_creature->getVictim()->CastSpell(m_creature->getVictim(), SPELL_SOUL_FLAY_SLOW, true);
                         Timer[TIMER_SOUL_FLAY] = 3500;
                         }
                         break;
                     case TIMER_LEGION_LIGHTNING:
-                        if(!m_creature->IsNonMeleeSpellCasted(false)){
+                        if (!m_creature->IsNonMeleeSpellCasted(false)){
                             m_creature->RemoveAurasDueToSpell(SPELL_SOUL_FLAY);
                             for(uint8 z = 0; z < 6; ++z){
                                 randomPlayer = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
                                 if (!randomPlayer->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0)) break;
                             }
-                            if(randomPlayer)DoCast(randomPlayer, SPELL_LEGION_LIGHTNING, false);
+                            if (randomPlayer)DoCast(randomPlayer, SPELL_LEGION_LIGHTNING, false);
                             else error_log("try to cast SPELL_LEGION_LIGHTNING on invalid target");
                             Timer[TIMER_LEGION_LIGHTNING] = (Phase == PHASE_SACRIFICE) ? 18000 : 30000; // 18 seconds in PHASE_SACRIFICE
                             Timer[TIMER_SOUL_FLAY] = 2500;
                         }
                         break;
                     case TIMER_FIRE_BLOOM:
-                        if(!m_creature->IsNonMeleeSpellCasted(false)){
+                        if (!m_creature->IsNonMeleeSpellCasted(false)){
                             m_creature->RemoveAurasDueToSpell(SPELL_SOUL_FLAY);
                             DoCastAOE(SPELL_FIRE_BLOOM, false);
                             Timer[TIMER_FIRE_BLOOM] = (Phase == PHASE_SACRIFICE) ? 25000 : 40000; // 25 seconds in PHASE_SACRIFICE
@@ -620,7 +620,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
                         Timer[TIMER_SOUL_FLAY] = 2000;
                         break;
                     case TIMER_SHADOW_SPIKE: //Phase 3
-                        if(!m_creature->IsNonMeleeSpellCasted(false)){
+                        if (!m_creature->IsNonMeleeSpellCasted(false)){
                         DoCastAOE(SPELL_SHADOW_SPIKE, false);
                         Timer[TIMER_SHADOW_SPIKE] = 0;
                         TimerIsDeactiveted[TIMER_SHADOW_SPIKE] = true;
@@ -632,15 +632,15 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
                         Timer[TIMER_FLAME_DART] = 3000; //TODO Timer
                         break;
                     case TIMER_DARKNESS: //Phase 3
-                        if(!m_creature->IsNonMeleeSpellCasted(false)){
+                        if (!m_creature->IsNonMeleeSpellCasted(false)){
                         // Begins to channel for 8 seconds, then deals 50'000 damage to all raid members.
-                        if(!IsInDarkness){
+                        if (!IsInDarkness){
                             DoScriptText(EMOTE_KJ_DARKNESS, m_creature);
                             DoCastAOE(SPELL_DARKNESS_OF_A_THOUSAND_SOULS, false);
                             ChangeTimers(true, 9000);
                             Timer[TIMER_DARKNESS] = 8750;
                             TimerIsDeactiveted[TIMER_DARKNESS] = false;
-                            if(Phase == PHASE_SACRIFICE) TimerIsDeactiveted[TIMER_ARMAGEDDON] = false;
+                            if (Phase == PHASE_SACRIFICE) TimerIsDeactiveted[TIMER_ARMAGEDDON] = false;
                             IsInDarkness = true;
                         }else{
                             Timer[TIMER_DARKNESS] = (Phase == PHASE_SACRIFICE) ? 20000 + rand()%15000 : 40000 + rand()%30000;
@@ -656,9 +656,9 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
                         }
                         break;
                     case TIMER_ORBS_EMPOWER: //Phase 3
-                        if(Phase == PHASE_SACRIFICE){
-                            if(Kalec)CAST_AI(boss_kalecgos_kjAI, Kalec->AI())->EmpowerOrb(true);
-                        }else if(Kalec)CAST_AI(boss_kalecgos_kjAI, Kalec->AI())->EmpowerOrb(false);
+                        if (Phase == PHASE_SACRIFICE){
+                            if (Kalec)CAST_AI(boss_kalecgos_kjAI, Kalec->AI())->EmpowerOrb(true);
+                        }else if (Kalec)CAST_AI(boss_kalecgos_kjAI, Kalec->AI())->EmpowerOrb(false);
                         Timer[TIMER_ORBS_EMPOWER]= (Phase == PHASE_SACRIFICE) ? 45000 : 35000;
                         OrbActivated = true;
                         TimerIsDeactiveted[TIMER_ORBS_EMPOWER] = true;
@@ -669,7 +669,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
                             target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
                             if (!target->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0)) break;
                         }
-                        if(target){
+                        if (target){
                             float x, y, z;
                             target->GetPosition(x, y, z);
                             m_creature->SummonCreature(CREATURE_ARMAGEDDON_TARGET, x,y,z,0, TEMPSUMMON_TIMED_DESPAWN,15000);
@@ -682,14 +682,14 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
         }
             //Time runs over!
             for(uint8 i = 0; i < ActiveTimers; ++i)
-                if(!TimerIsDeactiveted[i]){
+                if (!TimerIsDeactiveted[i]){
                     Timer[i] -= diff;
-                    if(((int32)Timer[i]) < 0) Timer[i] = 0;
+                    if (((int32)Timer[i]) < 0) Timer[i] = 0;
                 }
 
         //Phase 3
-        if(Phase <= PHASE_NORMAL){
-            if(Phase == PHASE_NORMAL && ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 85)){
+        if (Phase <= PHASE_NORMAL){
+            if (Phase == PHASE_NORMAL && ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 85)){
                 CastSinisterReflection();
                 DoScriptText(SAY_KJ_PHASE3, m_creature);
                 Phase = PHASE_DARKNESS;
@@ -700,8 +700,8 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
         }
 
         //Phase 4
-        if(Phase <= PHASE_DARKNESS){
-            if(Phase == PHASE_DARKNESS && ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 55)){
+        if (Phase <= PHASE_DARKNESS){
+            if (Phase == PHASE_DARKNESS && ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 55)){
                 DoScriptText(SAY_KJ_PHASE4, m_creature);
                 Phase = PHASE_ARMAGEDDON;
                 OrbActivated = false;
@@ -711,8 +711,8 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
         }
 
         //Phase 5 specific spells all we can
-        if(Phase <= PHASE_ARMAGEDDON){
-            if(Phase == PHASE_ARMAGEDDON && ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 25)){
+        if (Phase <= PHASE_ARMAGEDDON){
+            if (Phase == PHASE_ARMAGEDDON && ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 25)){
                 Phase = PHASE_SACRIFICE;
                 Creature* Anveena = (Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_ANVEENA)));
                 if (Anveena)Anveena->CastSpell(m_creature, SPELL_SACRIFICE_OF_ANVEENA, false);
@@ -757,7 +757,7 @@ struct TRINITY_DLL_DECL mob_kiljaeden_controllerAI : public Scripted_NoMovementA
 
     void Reset(){
         Phase = PHASE_DECEIVERS;
-        if(KalecKJ)CAST_AI(boss_kalecgos_kjAI, KalecKJ->AI())->ResetOrbs();
+        if (KalecKJ)CAST_AI(boss_kalecgos_kjAI, KalecKJ->AI())->ResetOrbs();
         DeceiverDeathCount = 0;
         SummonedDeceivers = false;
         KiljaedenDeath = false;
@@ -786,7 +786,7 @@ struct TRINITY_DLL_DECL mob_kiljaeden_controllerAI : public Scripted_NoMovementA
 
     void UpdateAI(const uint32 diff)
     {
-        if(RandomSayTimer < diff && pInstance->GetData(DATA_MURU_EVENT) != DONE && pInstance->GetData(DATA_KILJAEDEN_EVENT) == NOT_STARTED){
+        if (RandomSayTimer < diff && pInstance->GetData(DATA_MURU_EVENT) != DONE && pInstance->GetData(DATA_KILJAEDEN_EVENT) == NOT_STARTED){
             switch(rand()%5){
                 case 0: DoScriptText(SAY_KJ_OFFCOMBAT1, m_creature); break;
                 case 1: DoScriptText(SAY_KJ_OFFCOMBAT2, m_creature); break;
@@ -797,7 +797,7 @@ struct TRINITY_DLL_DECL mob_kiljaeden_controllerAI : public Scripted_NoMovementA
             RandomSayTimer = 30000;
         }else RandomSayTimer -= diff;
 
-        if(!SummonedDeceivers){
+        if (!SummonedDeceivers){
             for(uint8 i = 0; i < 3; ++i)
                 m_creature->SummonCreature(CREATURE_HAND_OF_THE_DECEIVER, DeceiverLocations[i][0], DeceiverLocations[i][1], FLOOR_Z, DeceiverLocations[i][2], TEMPSUMMON_DEAD_DESPAWN, 0);
 
@@ -806,7 +806,7 @@ struct TRINITY_DLL_DECL mob_kiljaeden_controllerAI : public Scripted_NoMovementA
             SummonedDeceivers = true;
         }
 
-        if(DeceiverDeathCount > 2 && Phase == PHASE_DECEIVERS){
+        if (DeceiverDeathCount > 2 && Phase == PHASE_DECEIVERS){
             m_creature->RemoveAurasDueToSpell(SPELL_ANVEENA_ENERGY_DRAIN) ;
             Phase = PHASE_NORMAL;
             DoSpawnCreature(CREATURE_KILJAEDEN, 0, 0,0, 0, TEMPSUMMON_MANUAL_DESPAWN, 0);
@@ -834,7 +834,7 @@ struct TRINITY_DLL_DECL mob_hand_of_the_deceiverAI : public ScriptedAI
         // TODO: Timers!
         ShadowBoltVolleyTimer = 8000 + rand()%6000; // So they don't all cast it in the same moment.
         FelfirePortalTimer = 20000;
-        if(pInstance)pInstance->SetData(DATA_KILJAEDEN_EVENT, NOT_STARTED);
+        if (pInstance)pInstance->SetData(DATA_KILJAEDEN_EVENT, NOT_STARTED);
     }
 
     void JustSummoned(Creature* summoned){
@@ -843,51 +843,51 @@ struct TRINITY_DLL_DECL mob_hand_of_the_deceiverAI : public ScriptedAI
     }
 
     void EnterCombat(Unit* who){
-        if(pInstance){
+        if (pInstance){
             pInstance->SetData(DATA_KILJAEDEN_EVENT, IN_PROGRESS);
             Creature* Control = CAST_CRE(Unit::GetUnit(*m_creature, pInstance->GetData64(DATA_KILJAEDEN_CONTROLLER)));
-            if(Control)
+            if (Control)
                 Control->AddThreat(who, 1.0f);
         }
         m_creature->InterruptNonMeleeSpells(true);
     }
 
     void JustDied(Unit* killer){
-        if(!pInstance)
+        if (!pInstance)
             return;
 
         Creature* Control = CAST_CRE(Unit::GetUnit(*m_creature, pInstance->GetData64(DATA_KILJAEDEN_CONTROLLER)));
-        if(Control)
+        if (Control)
             CAST_AI(mob_kiljaeden_controllerAI, Control->AI())->DeceiverDeathCount++;
     }
 
     void UpdateAI(const uint32 diff){
-        if(!me->isInCombat())
+        if (!me->isInCombat())
             DoCast(m_creature, SPELL_SHADOW_CHANNELING);
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         // Gain Shadow Infusion at 20% health
-        if(((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 20) && !m_creature->HasAura(SPELL_SHADOW_INFUSION, 0))
+        if (((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 20) && !m_creature->HasAura(SPELL_SHADOW_INFUSION, 0))
             DoCast(m_creature, SPELL_SHADOW_INFUSION, true);
 
         // Shadow Bolt Volley - Shoots Shadow Bolts at all enemies within 30 yards, for ~2k Shadow damage.
-        if(ShadowBoltVolleyTimer < diff){
+        if (ShadowBoltVolleyTimer < diff){
             DoCast(m_creature->getVictim(), SPELL_SHADOW_BOLT_VOLLEY);
             ShadowBoltVolleyTimer = 12000;
         }else ShadowBoltVolleyTimer -= diff;
 
         // Felfire Portal - Creatres a portal, that spawns Volatile Felfire Fiends, which do suicide bombing.
-        if(FelfirePortalTimer < diff){
+        if (FelfirePortalTimer < diff){
             Creature* Portal = DoSpawnCreature(CREATURE_FELFIRE_PORTAL, 0, 0,0, 0, TEMPSUMMON_TIMED_DESPAWN, 20000);
-            if(Portal)
+            if (Portal)
             {
                 std::list<HostilReference*>::iterator itr;
                 for(itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr)
                 {
                     Unit* pUnit = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
-                    if(pUnit)
+                    if (pUnit)
                         Portal->AddThreat(pUnit, 1.0f);
                 }
             }
@@ -929,13 +929,13 @@ struct TRINITY_DLL_DECL mob_felfire_portalAI : public Scripted_NoMovementAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(SpawnFiendTimer < diff)
+        if (SpawnFiendTimer < diff)
         {
             Creature* Fiend = DoSpawnCreature(CREATURE_VOLATILE_FELFIRE_FIEND, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000);
-            if(Fiend)
+            if (Fiend)
                 Fiend->AddThreat(SelectUnit(SELECT_TARGET_RANDOM,0), 100000.0f);
             SpawnFiendTimer = 4000 + rand()%4000;
         }else SpawnFiendTimer -= diff;
@@ -964,26 +964,26 @@ struct TRINITY_DLL_DECL mob_volatile_felfire_fiendAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(damage > m_creature->GetHealth())
+        if (damage > m_creature->GetHealth())
             DoCast(m_creature, SPELL_FELFIRE_FISSION, true);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(!LockedTarget){
+        if (!LockedTarget){
             m_creature->AddThreat(m_creature->getVictim(), 10000000.0f);
             LockedTarget = true;
         }
 
-        if(ExplodeTimer){
-            if(ExplodeTimer < diff)
+        if (ExplodeTimer){
+            if (ExplodeTimer < diff)
                 ExplodeTimer = 0;
             else ExplodeTimer -= diff;
         }
-        else if(m_creature->IsWithinDistInMap(m_creature->getVictim(), 3)) // Explode if it's close enough to it's target
+        else if (m_creature->IsWithinDistInMap(m_creature->getVictim(), 3)) // Explode if it's close enough to it's target
         {
             DoCast(m_creature->getVictim(), SPELL_FELFIRE_FISSION);
             m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
@@ -1011,7 +1011,7 @@ struct TRINITY_DLL_DECL mob_armageddonAI : public Scripted_NoMovementAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(Timer < diff){
+        if (Timer < diff){
             switch(Spell){
                 case 0:
                     DoCast(m_creature, SPELL_ARMAGEDDON_VISUAL, true);
@@ -1064,15 +1064,15 @@ struct TRINITY_DLL_DECL mob_shield_orbAI : public ScriptedAI
         c = 0;
         mx = ShieldOrbLocations[0][0];
         my = ShieldOrbLocations[0][1];
-        if(rand()%2 == 0)Clockwise = true;
+        if (rand()%2 == 0)Clockwise = true;
         else Clockwise = false;
     }
 
     void Reset(){}
 
     void UpdateAI(const uint32 diff){
-        if(PointReached){
-            if(Clockwise){
+        if (PointReached){
+            if (Clockwise){
                 y = my - r * sin(c);
                 x = mx - r * cos(c);
             }else{
@@ -1083,7 +1083,7 @@ struct TRINITY_DLL_DECL mob_shield_orbAI : public ScriptedAI
             CheckTimer = 1000;
             m_creature->GetMotionMaster()->MovePoint(1,x, y, SHIELD_ORB_Z);
             c += 3.1415926535/32;
-            if(c > 2*3.1415926535) c = 0;
+            if (c > 2*3.1415926535) c = 0;
         }else{
             if (CheckTimer < diff){
                 DoTeleportTo(x,y,SHIELD_ORB_Z);
@@ -1100,7 +1100,7 @@ struct TRINITY_DLL_DECL mob_shield_orbAI : public ScriptedAI
     }
 
     void MovementInform(uint32 type, uint32 id){
-        if(type != POINT_MOTION_TYPE)
+        if (type != POINT_MOTION_TYPE)
             return;
 
         PointReached = true;
@@ -1129,7 +1129,7 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff){
 
-        if(Class == 0){
+        if (Class == 0){
             Class = m_creature->getVictim()->getClass();
             switch(Class){
                 case CLASS_DRUID:
@@ -1158,23 +1158,23 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI
 
         switch(Class){
             case CLASS_DRUID:
-                if(Timer[1] < diff){
+                if (Timer[1] < diff){
                     DoCast(m_creature->getVictim(), SPELL_SR_MOONFIRE, false);
                     Timer[1] = 3000;
                 }
                 DoMeleeAttackIfReady();
                 break;
             case CLASS_HUNTER:
-                if(Timer[1] < diff){
+                if (Timer[1] < diff){
                     DoCast(m_creature->getVictim(), SPELL_SR_MULTI_SHOT, false);
                     Timer[1] = 9000;
                 }
-                if(Timer[2] < diff){
+                if (Timer[2] < diff){
                     DoCast(m_creature->getVictim(), SPELL_SR_SHOOT, false);
                     Timer[2] = 5000;
                 }
-                if(m_creature->IsWithinMeleeRange(m_creature->getVictim(), 6)){
-                    if(Timer[3] < diff){
+                if (m_creature->IsWithinMeleeRange(m_creature->getVictim(), 6)){
+                    if (Timer[3] < diff){
                         DoCast(m_creature->getVictim(), SPELL_SR_MULTI_SHOT, false);
                         Timer[3] = 7000;
                     }
@@ -1182,61 +1182,61 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI
                 }
                 break;
             case CLASS_MAGE:
-                if(Timer[1] < diff){
+                if (Timer[1] < diff){
                     DoCast(m_creature->getVictim(), SPELL_SR_FIREBALL, false);
                     Timer[1] = 3000;
                 }
                 DoMeleeAttackIfReady();
                 break;
             case CLASS_WARLOCK:
-                if(Timer[1] < diff){
+                if (Timer[1] < diff){
                     DoCast(m_creature->getVictim(), SPELL_SR_SHADOW_BOLT, false);
                     Timer[1] = 4000;
                 }
-                if(Timer[2] < diff){
+                if (Timer[2] < diff){
                     DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_SR_CURSE_OF_AGONY, true);
                     Timer[2] = 3000;
                 }
                 DoMeleeAttackIfReady();
                 break;
             case CLASS_WARRIOR:
-                if(Timer[1] < diff){
+                if (Timer[1] < diff){
                     DoCast(m_creature->getVictim(), SPELL_SR_WHIRLWIND, false);
                     Timer[1] = 10000;
                 }
                 DoMeleeAttackIfReady();
                 break;
             case CLASS_PALADIN:
-                if(Timer[1] < diff){
+                if (Timer[1] < diff){
                     DoCast(m_creature->getVictim(), SPELL_SR_HAMMER_OF_JUSTICE, false);
                     Timer[1] = 7000;
                 }
-                if(Timer[2] < diff){
+                if (Timer[2] < diff){
                     DoCast(m_creature->getVictim(), SPELL_SR_HOLY_SHOCK, false);
                     Timer[2] = 3000;
                 }
                 DoMeleeAttackIfReady();
                 break;
             case CLASS_PRIEST:
-                if(Timer[1] < diff){
+                if (Timer[1] < diff){
                     DoCast(m_creature->getVictim(), SPELL_SR_HOLY_SMITE, false);
                     Timer[1] = 5000;
                 }
-                if(Timer[2] < diff){
+                if (Timer[2] < diff){
                     DoCast(m_creature,  SPELL_SR_RENEW, false);
                     Timer[2] = 7000;
                 }
                 DoMeleeAttackIfReady();
                 break;
             case CLASS_SHAMAN:
-                if(Timer[1] < diff){
+                if (Timer[1] < diff){
                     DoCast(m_creature->getVictim(), SPELL_SR_EARTH_SHOCK, false);
                     Timer[1] = 5000;
                 }
                 DoMeleeAttackIfReady();
                 break;
             case CLASS_ROGUE:
-                if(Timer[1] < diff){
+                if (Timer[1] < diff){
                     DoCast(m_creature->getVictim(), SPELL_SR_HEMORRHAGE, true);
                     Timer[1] = 5000;
                 }
diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_muru.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_muru.cpp
index debfd7da595..ee995972ee5 100644
--- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_muru.cpp
+++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_muru.cpp
@@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL boss_entropiusAI : public ScriptedAI
 
         Summons.DespawnAll();
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_MURU_EVENT, NOT_STARTED);
     }
 
@@ -141,7 +141,7 @@ struct TRINITY_DLL_DECL boss_entropiusAI : public ScriptedAI
         DoCastAOE(SPELL_NEGATIVE_ENERGY_E, true);
         DoCast(m_creature, SPELL_ENTROPIUS_SPAWN, false);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_MURU_EVENT, IN_PROGRESS);
     }
 
@@ -167,30 +167,30 @@ struct TRINITY_DLL_DECL boss_entropiusAI : public ScriptedAI
     {
         Summons.DespawnAll();
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_MURU_EVENT, DONE);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(EnrageTimer < diff && !m_creature->HasAura(SPELL_ENRAGE, 0))
+        if (EnrageTimer < diff && !m_creature->HasAura(SPELL_ENRAGE, 0))
         {
             DoCast(m_creature,SPELL_ENRAGE, false);
         }else EnrageTimer -= diff;
 
-        if(BlackHoleSummonTimer < diff)
+        if (BlackHoleSummonTimer < diff)
         {
             Unit* random = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
-            if(!random)
+            if (!random)
                 return;
 
             DoCast(random, SPELL_DARKNESS_E, false);
 
             random = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
-            if(!random)
+            if (!random)
                 return;
 
             random->CastSpell(random, SPELL_BLACKHOLE, false);
@@ -237,7 +237,7 @@ struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI
 
         Summons.DespawnAll();
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_MURU_EVENT, NOT_STARTED);
     }
 
@@ -245,13 +245,13 @@ struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI
     {
         DoCastAOE(SPELL_NEGATIVE_ENERGY,false);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_MURU_EVENT, IN_PROGRESS);
     }
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(damage > m_creature->GetHealth() && Phase == 1)
+        if (damage > m_creature->GetHealth() && Phase == 1)
         {
             damage = 0;
             Phase = 2;
@@ -259,7 +259,7 @@ struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI
             DoCast(m_creature, SPELL_OPEN_ALL_PORTALS, false);
             m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
         }
-        if(Phase > 1 && Phase < 4)
+        if (Phase > 1 && Phase < 4)
             damage = 0;
     }
 
@@ -280,12 +280,12 @@ struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(Phase == 3)
+        if (Phase == 3)
         {
-            if(Timer[TIMER_PHASE] <diff)
+            if (Timer[TIMER_PHASE] <diff)
             {
                 switch(pInstance->GetData(DATA_MURU_EVENT))
                 {
@@ -310,12 +310,12 @@ struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI
 
         for (uint8 i = 0; i < 4; ++i)
         {
-            if(Timer[i] < diff)
+            if (Timer[i] < diff)
             {
                 switch(i)
                 {
                     case TIMER_DARKNESS:
-                        if(!DarkFiend)
+                        if (!DarkFiend)
                         {
                             DoCastAOE(SPELL_DARKNESS, false);
                             Timer[TIMER_DARKNESS] = 3000;
@@ -352,8 +352,8 @@ struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI
         //Timer
         for(uint8 i = 0; i < 4; ++i)
         {
-            if(i != TIMER_PHASE)Timer[i] -= diff;
-            else if(Phase == 2) Timer[i] -= diff;
+            if (i != TIMER_PHASE)Timer[i] -= diff;
+            else if (Phase == 2) Timer[i] -= diff;
         }
     }
 };
@@ -395,7 +395,7 @@ struct TRINITY_DLL_DECL npc_muru_portalAI : public Scripted_NoMovementAI
     void JustSummoned(Creature* summoned)
     {
         Player* Target = Unit::GetPlayer(pInstance->GetData64(DATA_PLAYER_GUID));
-        if(Target)
+        if (Target)
             summoned->AI()->AttackStart(Target);
 
         Summons.Summon(summoned);
@@ -421,12 +421,12 @@ struct TRINITY_DLL_DECL npc_muru_portalAI : public Scripted_NoMovementAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!SummonSentinel)
+        if (!SummonSentinel)
         {
-            if(InAction && pInstance->GetData(DATA_MURU_EVENT) == NOT_STARTED)Reset();
+            if (InAction && pInstance->GetData(DATA_MURU_EVENT) == NOT_STARTED)Reset();
             return;
         }
-        if(SummonTimer < diff)
+        if (SummonTimer < diff)
         {
             DoCastAOE(SPELL_SUMMON_VOID_SENTINEL, false);
             SummonTimer = 5000;
@@ -463,7 +463,7 @@ struct TRINITY_DLL_DECL npc_dark_fiendAI : public ScriptedAI
     void SpellHit(Unit* caster, const SpellEntry* Spell)
     {
         for(uint8 i = 0; i < 3; ++i)
-            if(Spell->Effect[i] == 38)
+            if (Spell->Effect[i] == 38)
             {
                 m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                 m_creature->RemoveCorpse();
@@ -472,12 +472,12 @@ struct TRINITY_DLL_DECL npc_dark_fiendAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         if (WaitTimer < diff)
         {
-            if(!InAction)
+            if (!InAction)
             {
                 m_creature->clearUnitState(UNIT_STAT_STUNNED);
                 DoCastAOE(SPELL_DARKFIEND_SKIN, false);
@@ -488,7 +488,7 @@ struct TRINITY_DLL_DECL npc_dark_fiendAI : public ScriptedAI
             else
             {
             
-                if(m_creature->IsWithinDist(m_creature->getVictim(), 5))
+                if (m_creature->IsWithinDist(m_creature->getVictim(), 5))
                 {
                     DoCastAOE(SPELL_DARKFIEND_AOE, false);
                     m_creature->DealDamage(m_creature, m_creature->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
@@ -536,16 +536,16 @@ struct TRINITY_DLL_DECL npc_void_sentinelAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(PulseTimer < diff)
+        if (PulseTimer < diff)
         {
             DoCastAOE(SPELL_SHADOW_PULSE, true);
             PulseTimer = 3000;
         }else PulseTimer -= diff;
 
-        if(VoidBlastTimer < diff)
+        if (VoidBlastTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_VOID_BLAST, false);
             VoidBlastTimer = 45000;
@@ -586,7 +586,7 @@ struct TRINITY_DLL_DECL npc_blackholeAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(SpellTimer < diff)
+        if (SpellTimer < diff)
         {
             Unit* Victim = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
             switch(NeedForAHack)
@@ -594,7 +594,7 @@ struct TRINITY_DLL_DECL npc_blackholeAI : public ScriptedAI
                 case 0:
                     m_creature->clearUnitState(UNIT_STAT_STUNNED);
                     DoCastAOE(SPELL_BLACKHOLE_GROW, false);
-                    if(Victim)
+                    if (Victim)
                         AttackStart(Victim);
                     SpellTimer = 700;
                     NeedForAHack = 2;
@@ -613,9 +613,9 @@ struct TRINITY_DLL_DECL npc_blackholeAI : public ScriptedAI
                     SpellTimer = 400+rand()%500;
                     NeedForAHack = 1;
                     Unit* Temp = m_creature->getVictim();
-                    if(!Temp)
+                    if (!Temp)
                         return;
-                    if(Temp->GetPositionZ() > 73 && Victim)
+                    if (Temp->GetPositionZ() > 73 && Victim)
                         AttackStart(Victim);
             }
         }else SpellTimer -= diff;
diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp
index 9a8497a2df9..f4dc1215763 100644
--- a/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp
+++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp
@@ -25,7 +25,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
 {
-    instance_sunwell_plateau(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_sunwell_plateau(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounters[ENCOUNTERS];
 
@@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS)
+            if (Encounters[i] == IN_PROGRESS)
                 return true;
 
         return false;
@@ -137,13 +137,13 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
         {
             case 188421: ForceField     = go->GetGUID(); break;
             case 188075:
-                if(Encounters[2] == DONE)
+                if (Encounters[2] == DONE)
                     HandleGameObject(NULL, true, go);
                 FireBarrier = go->GetGUID();
                 break;
             case 187990: MurusGate[0]   = go->GetGUID(); break;
             case 188118:
-                if(Encounters[4] == DONE)
+                if (Encounters[4] == DONE)
                     HandleGameObject(NULL, true, go);
                 MurusGate[1]= go->GetGUID();
                 break;
@@ -196,7 +196,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
             case DATA_KALECGOS_EVENT:      Encounters[0] = data; break;
             case DATA_BRUTALLUS_EVENT:     Encounters[1] = data; break;
             case DATA_FELMYST_EVENT:
-                if(data == DONE)
+                if (data == DONE)
                     HandleGameObject(FireBarrier, true);
                 Encounters[2] = data; break;
             case DATA_EREDAR_TWINS_EVENT:  Encounters[3] = data; break;
@@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
             case DATA_KILJAEDEN_EVENT:     Encounters[5] = data; break;
         }
 
-        if(data == DONE)
+        if (data == DONE)
             SaveToDB();
     }
 
@@ -232,7 +232,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
             << Encounters[4] << " "  << Encounters[5];
         char* out = new char[stream.str().length() + 1];
         strcpy(out, stream.str().c_str());
-        if(out)
+        if (out)
         {
             OUT_SAVE_INST_DATA_COMPLETE;
             return out;
@@ -242,7 +242,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
 
     void Load(const char* in)
     {
-        if(!in)
+        if (!in)
         {
             OUT_LOAD_INST_DATA_FAIL;
             return;
@@ -253,15 +253,15 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
         stream >> Encounters[0] >> Encounters[1] >> Encounters[2] >> Encounters[3]
             >> Encounters[4] >> Encounters[5];
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS)                // Do not load an encounter as "In Progress" - reset it instead.
+            if (Encounters[i] == IN_PROGRESS)                // Do not load an encounter as "In Progress" - reset it instead.
                 Encounters[i] = NOT_STARTED;
         OUT_LOAD_INST_DATA_COMPLETE;
     }
 };
 
-InstanceData* GetInstanceData_instance_sunwell_plateau(Map* map)
+InstanceData* GetInstanceData_instance_sunwell_plateau(Map* pMap)
 {
-    return new instance_sunwell_plateau(map);
+    return new instance_sunwell_plateau(pMap);
 }
 
 void AddSC_instance_sunwell_plateau()
diff --git a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp
index 9d59062abcb..30e62350c41 100644
--- a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp
+++ b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp
@@ -72,9 +72,9 @@ struct TRINITY_DLL_DECL mob_aquementasAI : public ScriptedAI
             !CAST_PLR(receiver)->HasItemCount(11522,1,true))
         {
             ItemPosCountVec dest;
-            uint8 msg = CAST_PLR(receiver)->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, 11522, 1, false);
-            if( msg == EQUIP_ERR_OK )
-                CAST_PLR(receiver)->StoreNewItem( dest, 11522, 1, true);
+            uint8 msg = CAST_PLR(receiver)->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 11522, 1, false);
+            if (msg == EQUIP_ERR_OK)
+                CAST_PLR(receiver)->StoreNewItem(dest, 11522, 1, true);
         }
     }
 
@@ -85,9 +85,9 @@ struct TRINITY_DLL_DECL mob_aquementasAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if( isFriendly )
+        if (isFriendly)
         {
-            if( SwitchFaction_Timer < diff )
+            if (SwitchFaction_Timer < diff)
             {
                 m_creature->setFaction(91);
                 isFriendly = false;
@@ -97,23 +97,23 @@ struct TRINITY_DLL_DECL mob_aquementasAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if( !isFriendly )
+        if (!isFriendly)
         {
-            if( SendItem_Timer < diff )
+            if (SendItem_Timer < diff)
             {
-                if( m_creature->getVictim()->GetTypeId() == TYPEID_PLAYER )
+                if (m_creature->getVictim()->GetTypeId() == TYPEID_PLAYER)
                     SendItem(m_creature->getVictim());
                 SendItem_Timer = 5000;
             }else SendItem_Timer -= diff;
         }
 
-        if( FrostShock_Timer < diff )
+        if (FrostShock_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_FROST_SHOCK);
             FrostShock_Timer = 15000;
         }else FrostShock_Timer -= diff;
 
-        if( AquaJet_Timer < diff )
+        if (AquaJet_Timer < diff)
         {
             DoCast(m_creature,SPELL_AQUA_JET);
             AquaJet_Timer = 15000;
@@ -153,10 +153,10 @@ struct TRINITY_DLL_DECL npc_custodian_of_timeAI : public npc_escortAI
     void WaypointReached(uint32 i)
     {
         Player *pPlayer = Unit::GetPlayer(PlayerGUID);
-        if( !pPlayer )
+        if (!pPlayer)
             return;
 
-        switch( i )
+        switch(i)
         {
             case 0: DoScriptText(WHISPER_CUSTODIAN_1, m_creature, pPlayer); break;
             case 1: DoScriptText(WHISPER_CUSTODIAN_2, m_creature, pPlayer); break;
@@ -186,15 +186,15 @@ struct TRINITY_DLL_DECL npc_custodian_of_timeAI : public npc_escortAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if( IsBeingEscorted )
+        if (IsBeingEscorted)
             return;
 
-        if( who->GetTypeId() == TYPEID_PLAYER )
+        if (who->GetTypeId() == TYPEID_PLAYER)
         {
-            if( who->HasAura(34877) && CAST_PLR(who)->GetQuestStatus(10277) == QUEST_STATUS_INCOMPLETE )
+            if (who->HasAura(34877) && CAST_PLR(who)->GetQuestStatus(10277) == QUEST_STATUS_INCOMPLETE)
             {
                 float Radius = 10.0;
-                if( m_creature->IsWithinDistInMap(who, Radius) )
+                if (m_creature->IsWithinDistInMap(who, Radius))
                 {
                     Start(false, false, who->GetGUID());
                 }
@@ -224,23 +224,23 @@ CreatureAI* GetAI_npc_custodian_of_time(Creature* pCreature)
 ## npc_marin_noggenfogger
 ######*/
 
-bool GossipHello_npc_marin_noggenfogger(Player *player, Creature *_Creature)
+bool GossipHello_npc_marin_noggenfogger(Player* pPlayer, Creature *_Creature)
 {
-    if( _Creature->isQuestGiver() )
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( _Creature->isVendor() && player->GetQuestRewardStatus(2662) )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+    if (_Creature->isVendor() && pPlayer->GetQuestRewardStatus(2662))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_marin_noggenfogger(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_marin_noggenfogger(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_TRADE )
-        player->SEND_VENDORLIST( _Creature->GetGUID() );
+    if (action == GOSSIP_ACTION_TRADE)
+        pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
 
     return true;
 }
@@ -251,34 +251,34 @@ bool GossipSelect_npc_marin_noggenfogger(Player *player, Creature *_Creature, ui
 
 #define GOSSIP_ITEM_FLIGHT  "Please take me to the master's lair."
 
-bool GossipHello_npc_steward_of_time(Player *player, Creature *_Creature)
+bool GossipHello_npc_steward_of_time(Player* pPlayer, Creature *_Creature)
 {
-    if( _Creature->isQuestGiver() )
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( player->GetQuestStatus(10279) == QUEST_STATUS_INCOMPLETE || player->GetQuestRewardStatus(10279) )
+    if (pPlayer->GetQuestStatus(10279) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestRewardStatus(10279))
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-        player->SEND_GOSSIP_MENU(9978,_Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        pPlayer->SEND_GOSSIP_MENU(9978,_Creature->GetGUID());
     }
     else
-        player->SEND_GOSSIP_MENU(9977,_Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(9977,_Creature->GetGUID());
 
     return true;
 }
 
-bool QuestAccept_npc_steward_of_time(Player *player, Creature *creature, Quest const *quest )
+bool QuestAccept_npc_steward_of_time(Player* pPlayer, Creature *creature, Quest const *quest)
 {
-    if( quest->GetQuestId() == 10279 )                      //Quest: To The Master's Lair
-        player->CastSpell(player,34891,true);               //(Flight through Caverns)
+    if (quest->GetQuestId() == 10279)                      //Quest: To The Master's Lair
+        pPlayer->CastSpell(pPlayer,34891,true);               //(Flight through Caverns)
 
     return false;
 }
 
-bool GossipSelect_npc_steward_of_time(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_steward_of_time(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_INFO_DEF + 1 )
-        player->CastSpell(player,34891,true);               //(Flight through Caverns)
+    if (action == GOSSIP_ACTION_INFO_DEF + 1)
+        pPlayer->CastSpell(pPlayer,34891,true);               //(Flight through Caverns)
 
     return true;
 }
@@ -294,46 +294,46 @@ bool GossipSelect_npc_steward_of_time(Player *player, Creature *_Creature, uint3
 #define GOSSIP_ITEM_NORGANNON_5     "So, what's inside Uldum?"
 #define GOSSIP_ITEM_NORGANNON_6     "I will return when i have the Plates of Uldum."
 
-bool GossipHello_npc_stone_watcher_of_norgannon(Player *player, Creature *_Creature)
+bool GossipHello_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature *_Creature)
 {
-    if( _Creature->isQuestGiver() )
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( player->GetQuestStatus(2954) == QUEST_STATUS_INCOMPLETE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(2954) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(1674, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(1674, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_stone_watcher_of_norgannon(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-            player->SEND_GOSSIP_MENU(1675, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+            pPlayer->SEND_GOSSIP_MENU(1675, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->SEND_GOSSIP_MENU(1676, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(1676, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-            player->SEND_GOSSIP_MENU(1677, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+            pPlayer->SEND_GOSSIP_MENU(1677, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
-            player->SEND_GOSSIP_MENU(1678, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+            pPlayer->SEND_GOSSIP_MENU(1678, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-            player->SEND_GOSSIP_MENU(1679, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            pPlayer->SEND_GOSSIP_MENU(1679, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(2954);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(2954);
             break;
     }
     return true;
@@ -360,9 +360,9 @@ struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!player)
+        if (!pPlayer)
             return;
 
         switch(i) {
@@ -378,15 +378,15 @@ struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI
                 m_creature->SummonCreature(SPAWN_SECOND_2, -7515.07, -4797.50, 9.35, 6.22, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
                 m_creature->SummonCreature(SPAWN_SECOND_2, -7518.07, -4792.50, 9.35, 6.22, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
                 DoScriptText(SAY_CHICKEN_AMB, m_creature);
-                if(Unit* scoff = me->FindNearestCreature(SPAWN_SECOND_2, 30))
+                if (Unit* scoff = me->FindNearestCreature(SPAWN_SECOND_2, 30))
                     DoScriptText(SAY_SCOFF, scoff);
                 break;
 
             case 86:
-                if (player)
+                if (pPlayer)
                 {
                     DoScriptText(SAY_CHICKEN_COMP, m_creature);
-                    player->GroupEventHappens(Q_OOX17, m_creature);
+                    pPlayer->GroupEventHappens(Q_OOX17, m_creature);
                 }
                 break;
         }
@@ -412,8 +412,8 @@ struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI
     {
         if (PlayerGUID)
         {
-            if (Player* player = Unit::GetPlayer(PlayerGUID))
-                CAST_PLR(player)->FailQuest(Q_OOX17);
+            if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
+                CAST_PLR(pPlayer)->FailQuest(Q_OOX17);
         }
     }
 
@@ -426,7 +426,7 @@ struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI
     }
     };
 
-bool QuestAccept_npc_OOX17(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_OOX17(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == Q_OOX17)
     {
@@ -435,7 +435,7 @@ bool QuestAccept_npc_OOX17(Player* player, Creature* creature, Quest const* ques
         creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0);
         creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
         DoScriptText(SAY_CHICKEN_ACC, creature);
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
 
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/teldrassil/teldrassil.cpp b/src/bindings/scripts/scripts/zone/teldrassil/teldrassil.cpp
index 484414da0a6..58cb2a55b2f 100644
--- a/src/bindings/scripts/scripts/zone/teldrassil/teldrassil.cpp
+++ b/src/bindings/scripts/scripts/zone/teldrassil/teldrassil.cpp
@@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL npc_mistAI : public ScriptedAI
             }
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp
index b8dd3cc6db3..128fb4aada6 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp
@@ -86,12 +86,12 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI
         Pyroblast_Timer = 1000;
         Fireball_Timer = 2500;
 
-        if( pInstance )
+        if (pInstance)
         {
-            if( pInstance->GetData(TYPE_WARDEN_2) == DONE )
+            if (pInstance->GetData(TYPE_WARDEN_2) == DONE)
                 Init = true;
 
-            if( pInstance->GetData(TYPE_HARBINGERSKYRISS) == DONE )
+            if (pInstance->GetData(TYPE_HARBINGERSKYRISS) == DONE)
             {
                 DoScriptText(SAY_COMPLETE, m_creature);
             }
@@ -128,19 +128,19 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI
         DoScriptText(SAY_DEATH, m_creature);
 
         /*for questId 10886 (heroic mode only)
-        if( pInstance && pInstance->GetData(TYPE_HARBINGERSKYRISS) != DONE )
+        if (pInstance && pInstance->GetData(TYPE_HARBINGERSKYRISS) != DONE)
             ->FailQuest();*/
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if( !Init )
+        if (!Init)
         {
-            if( EventProgress_Timer < diff )
+            if (EventProgress_Timer < diff)
             {
-                if( Phase < 8 )
+                if (Phase < 8)
                 {
-                    switch( Phase )
+                    switch(Phase)
                     {
                         case 1:
                             DoScriptText(SAY_INTRO_1, m_creature);
@@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI
                             EventProgress_Timer = 6000;
                             break;
                         case 7:
-                            if( pInstance )
+                            if (pInstance)
                                 pInstance->SetData(TYPE_WARDEN_2,DONE);
                             Init = true;
                             break;
@@ -180,18 +180,18 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI
             } else EventProgress_Timer -= diff;
         }
 
-        if( !UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if( !LowHp && ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 20) )
+        if (!LowHp && ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 20))
         {
             DoScriptText(SAY_LOWHP, m_creature);
             LowHp = true;
         }
 
-        if( Pyroblast_Timer < diff )
+        if (Pyroblast_Timer < diff)
         {
-            if( m_creature->IsNonMeleeSpellCasted(false) )
+            if (m_creature->IsNonMeleeSpellCasted(false))
                 return;
 
              DoScriptText(SAY_PYRO, m_creature);
@@ -200,7 +200,7 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI
             Pyroblast_Timer = 40000;
         }else Pyroblast_Timer -=diff;
 
-        if( Fireball_Timer < diff )
+        if (Fireball_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_FIREBALL);
             Fireball_Timer = 4000;
@@ -276,7 +276,7 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI
         m_creature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE);
         DoCast(m_creature,SPELL_TARGET_OMEGA);
 
-        if( pInstance )
+        if (pInstance)
             pInstance->SetData(TYPE_HARBINGERSKYRISS,NOT_STARTED);
     }
 
@@ -284,10 +284,10 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if( IsRunning )
+        if (IsRunning)
             return;
 
-        if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
+        if (!m_creature->getVictim() && who->isTargetableForAttack() && (m_creature->IsHostileTo(who)) && who->isInAccessiblePlaceFor(m_creature))
         {
             if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
                 return;
@@ -295,7 +295,7 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI
                 return;
 
             float attackRadius = m_creature->GetAttackDistance(who)/10;
-            if( m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who) )
+            if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->IsWithinLOSInMap(who))
                 EnterCombat(who);
         }
     }
@@ -305,7 +305,7 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI
         DoScriptText(YELL_INTRO1, m_creature);
         DoCast(m_creature,SPELL_BUBBLE_VISUAL);
 
-        if( pInstance )
+        if (pInstance)
         {
             pInstance->SetData(TYPE_HARBINGERSKYRISS,IN_PROGRESS);
             pInstance->HandleGameObject(pInstance->GetData64(DATA_SPHERE_SHIELD), false);
@@ -315,21 +315,21 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI
 
     bool CanProgress()
     {
-        if( pInstance )
+        if (pInstance)
         {
-            if( Phase == 7 && pInstance->GetData(TYPE_WARDEN_4) == DONE )
+            if (Phase == 7 && pInstance->GetData(TYPE_WARDEN_4) == DONE)
                 return true;
-            if( Phase == 6 && pInstance->GetData(TYPE_WARDEN_3) == DONE )
+            if (Phase == 6 && pInstance->GetData(TYPE_WARDEN_3) == DONE)
                 return true;
-            if( Phase == 5 && pInstance->GetData(TYPE_WARDEN_2) == DONE )
+            if (Phase == 5 && pInstance->GetData(TYPE_WARDEN_2) == DONE)
                 return true;
-            if( Phase == 4 )
+            if (Phase == 4)
                 return true;
-            if( Phase == 3 && pInstance->GetData(TYPE_WARDEN_1) == DONE )
+            if (Phase == 3 && pInstance->GetData(TYPE_WARDEN_1) == DONE)
                 return true;
-            if( Phase == 2 && pInstance->GetData(TYPE_HARBINGERSKYRISS) == IN_PROGRESS )
+            if (Phase == 2 && pInstance->GetData(TYPE_HARBINGERSKYRISS) == IN_PROGRESS)
                 return true;
-            if( Phase == 1 && pInstance->GetData(TYPE_HARBINGERSKYRISS) == IN_PROGRESS )
+            if (Phase == 1 && pInstance->GetData(TYPE_HARBINGERSKYRISS) == IN_PROGRESS)
                 return true;
             return false;
         }
@@ -338,12 +338,12 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI
 
     void DoPrepareForPhase()
     {
-        if( pInstance )
+        if (pInstance)
         {
             m_creature->InterruptNonMeleeSpells(true);
             m_creature->RemoveAurasByType(SPELL_AURA_DUMMY);
 
-            switch( Phase )
+            switch(Phase)
             {
                 case 2:
                     DoCast(m_creature,SPELL_TARGET_ALPHA);
@@ -372,27 +372,27 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if( !IsRunning )
+        if (!IsRunning)
             return;
 
-        if( EventProgress_Timer < diff )
+        if (EventProgress_Timer < diff)
         {
-            if( pInstance )
+            if (pInstance)
             {
-                if( pInstance->GetData(TYPE_HARBINGERSKYRISS) == FAIL )
+                if (pInstance->GetData(TYPE_HARBINGERSKYRISS) == FAIL)
                     Reset();
             }
 
-            if( CanSpawn )
+            if (CanSpawn)
             {
                 //continue beam omega pod, unless we are about to summon skyriss
-                if( Phase != 7 )
+                if (Phase != 7)
                     DoCast(m_creature,SPELL_TARGET_OMEGA);
 
-                switch( Phase )
+                switch(Phase)
                 {
                     case 2:
-                        switch( rand()%2 )
+                        switch(rand()%2)
                         {
                             case 0: m_creature->SummonCreature(ENTRY_TRICKSTER,478.326,-148.505,42.56,3.19,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break;
                             case 1: m_creature->SummonCreature(ENTRY_PH_HUNTER,478.326,-148.505,42.56,3.19,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break;
@@ -405,14 +405,14 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI
                        DoScriptText(YELL_RELEASE2B, m_creature);
                         break;
                     case 5:
-                        switch( rand()%2 )
+                        switch(rand()%2)
                         {
                             case 0: m_creature->SummonCreature(ENTRY_AKKIRIS,420.179,-174.396,42.58,0.02,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break;
                             case 1: m_creature->SummonCreature(ENTRY_SULFURON,420.179,-174.396,42.58,0.02,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break;
                         }
                         break;
                     case 6:
-                        switch( rand()%2 )
+                        switch(rand()%2)
                         {
                             case 0: m_creature->SummonCreature(ENTRY_TW_DRAK,471.795,-174.58,42.58,3.06,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break;
                             case 1: m_creature->SummonCreature(ENTRY_BL_DRAK,471.795,-174.58,42.58,3.06,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000); break;
@@ -426,9 +426,9 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI
                 CanSpawn = false;
                 ++Phase;
             }
-            if( CanProgress() )
+            if (CanProgress())
             {
-                switch( Phase )
+                switch(Phase)
                 {
                     case 1:
                         DoScriptText(YELL_INTRO2, m_creature);
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
index 03a7e588868..7d388f18284 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
@@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI
 
     void Reset()
     {
-        if(!Intro)
+        if (!Intro)
             m_creature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_ATTACKABLE_2);
 
         IsImage33 = false;
@@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(!Intro)
+        if (!Intro)
         {
             return;
         }
@@ -106,27 +106,27 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI
     void JustDied(Unit* Killer)
     {
         DoScriptText(SAY_DEATH, m_creature);
-        if( pInstance )
+        if (pInstance)
             pInstance->SetData(TYPE_HARBINGERSKYRISS,DONE);
     }
 
     void JustSummoned(Creature *summon)
     {
-        if(!summon)
+        if (!summon)
             return;
-        if(IsImage66)
+        if (IsImage66)
             summon->SetHealth((summon->GetMaxHealth()*33)/100);
         else
             summon->SetHealth((summon->GetMaxHealth()*66)/100);
-        if(m_creature->getVictim())
-            if(Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+        if (m_creature->getVictim())
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 summon->AI()->AttackStart(target);
      }
 
     void KilledUnit(Unit* victim)
     {
         //won't yell killing pet/other unit
-        if( victim->GetEntry() == 21436 )
+        if (victim->GetEntry() == 21436)
             return;
 
         switch(rand()%2)
@@ -138,12 +138,12 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI
 
     void DoSplit(uint32 val)
     {
-        if( m_creature->IsNonMeleeSpellCasted(false) )
+        if (m_creature->IsNonMeleeSpellCasted(false))
             m_creature->InterruptNonMeleeSpells(false);
 
         DoScriptText(SAY_IMAGE, m_creature);
 
-        if( val == 66 )
+        if (val == 66)
             DoCast(m_creature, SPELL_66_ILLUSION);
         else
             DoCast(m_creature, SPELL_33_ILLUSION);
@@ -151,14 +151,14 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!Intro)
+        if (!Intro)
         {
-            if( !pInstance )
+            if (!pInstance)
                 return;
 
-            if( Intro_Timer < diff )
+            if (Intro_Timer < diff)
             {
-                switch( Intro_Phase )
+                switch(Intro_Phase)
                 {
                     case 1:
                         DoScriptText(SAY_INTRO, m_creature);
@@ -168,7 +168,7 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI
                         break;
                     case 2:
                         DoScriptText(SAY_AGGRO, m_creature);
-                        if( Unit *mellic = Unit::GetUnit(*m_creature,pInstance->GetData64(DATA_MELLICHAR)) )
+                        if (Unit *mellic = Unit::GetUnit(*m_creature,pInstance->GetData64(DATA_MELLICHAR)))
                         {
                             //should have a better way to do this. possibly spell exist.
                             mellic->setDeathState(JUST_DIED);
@@ -186,23 +186,23 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI
             }else Intro_Timer -=diff;
         }
 
-        if( !UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if( !IsImage66 && ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() <= 66) )
+        if (!IsImage66 && ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() <= 66))
         {
             DoSplit(66);
             IsImage66 = true;
         }
-        if( !IsImage33 && ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() <= 33) )
+        if (!IsImage33 && ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() <= 33))
         {
             DoSplit(33);
             IsImage33 = true;
         }
 
-        if( MindRend_Timer < diff )
+        if (MindRend_Timer < diff)
         {
-            if( Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1) )
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1))
                 DoCast(target,HeroicMode ? H_SPELL_MIND_REND : SPELL_MIND_REND);
             else
                 DoCast(m_creature->getVictim(),HeroicMode ? H_SPELL_MIND_REND : SPELL_MIND_REND);
@@ -210,9 +210,9 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI
             MindRend_Timer = 8000;
         }else MindRend_Timer -=diff;
 
-        if( Fear_Timer < diff )
+        if (Fear_Timer < diff)
         {
-            if( m_creature->IsNonMeleeSpellCasted(false) )
+            if (m_creature->IsNonMeleeSpellCasted(false))
                 return;
 
             switch(rand()%2)
@@ -221,7 +221,7 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI
             case 1: DoScriptText(SAY_FEAR_2, m_creature); break;
             }
 
-            if( Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1) )
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1))
                 DoCast(target,SPELL_FEAR);
             else
                 DoCast(m_creature->getVictim(),SPELL_FEAR);
@@ -229,9 +229,9 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI
             Fear_Timer = 25000;
         }else Fear_Timer -=diff;
 
-        if( Domination_Timer < diff )
+        if (Domination_Timer < diff)
         {
-            if( m_creature->IsNonMeleeSpellCasted(false) )
+            if (m_creature->IsNonMeleeSpellCasted(false))
                 return;
 
             switch(rand()%2)
@@ -240,7 +240,7 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI
             case 1: DoScriptText(SAY_MIND_2, m_creature); break;
             }
 
-            if( Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1) )
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1))
                 DoCast(target,HeroicMode ? H_SPELL_DOMINATION : SPELL_DOMINATION);
             else
                 DoCast(m_creature->getVictim(),HeroicMode ? H_SPELL_DOMINATION : SPELL_DOMINATION);
@@ -248,14 +248,14 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI
             Domination_Timer = 16000+rand()%16000;
         }else Domination_Timer -=diff;
 
-        if( HeroicMode )
+        if (HeroicMode)
         {
-            if( ManaBurn_Timer < diff )
+            if (ManaBurn_Timer < diff)
             {
-                if( m_creature->IsNonMeleeSpellCasted(false) )
+                if (m_creature->IsNonMeleeSpellCasted(false))
                     return;
 
-                if( Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1) )
+                if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1))
                     DoCast(target,H_SPELL_MANA_BURN);
 
                 ManaBurn_Timer = 16000+rand()%16000;
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp
index aee0aa2838e..430f16d0915 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp
@@ -48,7 +48,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_arcatraz : public ScriptedInstance
 {
-    instance_arcatraz(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_arcatraz(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounter[ENCOUNTERS];
 
@@ -85,7 +85,7 @@ struct TRINITY_DLL_DECL instance_arcatraz : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounter[i] == IN_PROGRESS)
+            if (Encounter[i] == IN_PROGRESS)
                 return true;
 
         return false;
@@ -122,21 +122,21 @@ struct TRINITY_DLL_DECL instance_arcatraz : public ScriptedInstance
                 break;
 
             case TYPE_DALLIAH:
-                if( data == DONE )
-                    if( Containment_Core_Security_Field_Beta )
+                if (data == DONE)
+                    if (Containment_Core_Security_Field_Beta)
                         Containment_Core_Security_Field_Beta->UseDoorOrButton();
                 Encounter[1] = data;
                 break;
 
             case TYPE_SOCCOTHRATES:
-                if( data == DONE )
-                    if( Containment_Core_Security_Field_Alpha )
+                if (data == DONE)
+                    if (Containment_Core_Security_Field_Alpha)
                         Containment_Core_Security_Field_Alpha->UseDoorOrButton();
                 Encounter[2] = data;
                 break;
 
             case TYPE_HARBINGERSKYRISS:
-                if( data == NOT_STARTED || data == FAIL )
+                if (data == NOT_STARTED || data == FAIL)
                 {
                     Encounter[4] = NOT_STARTED;
                     Encounter[5] = NOT_STARTED;
@@ -148,43 +148,43 @@ struct TRINITY_DLL_DECL instance_arcatraz : public ScriptedInstance
                 break;
 
             case TYPE_WARDEN_1:
-                if( data == IN_PROGRESS )
-                    if( Pod_Alpha )
+                if (data == IN_PROGRESS)
+                    if (Pod_Alpha)
                         Pod_Alpha->UseDoorOrButton();
                 Encounter[4] = data;
                 break;
 
             case TYPE_WARDEN_2:
-                if( data == IN_PROGRESS )
-                    if( Pod_Beta )
+                if (data == IN_PROGRESS)
+                    if (Pod_Beta)
                         Pod_Beta->UseDoorOrButton();
                 Encounter[5] = data;
                 break;
 
             case TYPE_WARDEN_3:
-                if( data == IN_PROGRESS )
-                    if( Pod_Delta )
+                if (data == IN_PROGRESS)
+                    if (Pod_Delta)
                         Pod_Delta->UseDoorOrButton();
                 Encounter[6] = data;
                 break;
 
             case TYPE_WARDEN_4:
-                if( data == IN_PROGRESS )
-                    if( Pod_Gamma )
+                if (data == IN_PROGRESS)
+                    if (Pod_Gamma)
                         Pod_Gamma->UseDoorOrButton();
                 Encounter[7] = data;
                 break;
 
             case TYPE_WARDEN_5:
-                if( data == IN_PROGRESS )
-                    if( Pod_Omega )
+                if (data == IN_PROGRESS)
+                    if (Pod_Omega)
                         Pod_Omega->UseDoorOrButton();
                 Encounter[8] = data;
                 break;
 
             case TYPE_SHIELD_OPEN:
-                if( data == IN_PROGRESS )
-                    if( Wardens_Shield )
+                if (data == IN_PROGRESS)
+                    if (Wardens_Shield)
                         Wardens_Shield->UseDoorOrButton();
                 break;
         }
@@ -223,9 +223,9 @@ struct TRINITY_DLL_DECL instance_arcatraz : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_arcatraz(Map* map)
+InstanceData* GetInstanceData_instance_arcatraz(Map* pMap)
 {
-    return new instance_arcatraz(map);
+    return new instance_arcatraz(pMap);
 }
 
 void AddSC_instance_arcatraz()
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
index 13e65b9e416..50a8a66bce8 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
@@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI
 
     void JustSummoned(Creature *summoned)
     {
-        if( summoned->GetEntry() == ENTRY_FRAYER )
+        if (summoned->GetEntry() == ENTRY_FRAYER)
             Adds_List.push_back(summoned->GetGUID());
     }
 
@@ -102,10 +102,10 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if( !UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if( TreeForm_Timer < diff )
+        if (TreeForm_Timer < diff)
         {
             switch(rand()%2)
             {
@@ -113,7 +113,7 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI
             case 1: DoScriptText(SAY_TREE_2, m_creature); break;
             }
 
-            if( m_creature->IsNonMeleeSpellCasted(false) )
+            if (m_creature->IsNonMeleeSpellCasted(false))
                 m_creature->InterruptNonMeleeSpells(true);
 
             m_creature->RemoveAllAuras();
@@ -128,17 +128,17 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI
             TreeForm_Timer = 75000;
         }else TreeForm_Timer -= diff;
 
-        if( !MoveFree )
+        if (!MoveFree)
         {
-            if( MoveCheck_Timer < diff )
+            if (MoveCheck_Timer < diff)
             {
-                if( !Adds_List.empty() )
+                if (!Adds_List.empty())
                 {
                     for(std::list<uint64>::iterator itr = Adds_List.begin(); itr != Adds_List.end(); ++itr)
                     {
-                        if( Unit *temp = Unit::GetUnit(*m_creature,*itr) )
+                        if (Unit *temp = Unit::GetUnit(*m_creature,*itr))
                         {
-                            if( !temp->isAlive() )
+                            if (!temp->isAlive())
                             {
                                 Adds_List.erase(itr);
                                 ++DeadAddsCount;
@@ -148,10 +148,10 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI
                     }
                 }
 
-                if( DeadAddsCount < 3 && TreeForm_Timer-30000 < diff )
+                if (DeadAddsCount < 3 && TreeForm_Timer-30000 < diff)
                     DeadAddsCount = 3;
 
-                if( DeadAddsCount >= 3 )
+                if (DeadAddsCount >= 3)
                 {
                     Adds_List.clear();
                     DeadAddsCount = 0;
@@ -168,11 +168,11 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI
             return;
         }
 
-        /*if( m_creature->HasAura(SPELL_TREE_FORM,0) || m_creature->HasAura(SPELL_TRANQUILITY,0) )
+        /*if (m_creature->HasAura(SPELL_TREE_FORM,0) || m_creature->HasAura(SPELL_TRANQUILITY,0))
             return;*/
 
         //one random seedling every 5 secs, but not in tree form
-        if( SummonSeedling_Timer < diff )
+        if (SummonSeedling_Timer < diff)
         {
             DoSummonSeedling();
             SummonSeedling_Timer = 6000;
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp
index f789cb8a75f..6478d5aaec9 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_laj.cpp
@@ -146,18 +146,18 @@ struct TRINITY_DLL_DECL boss_lajAI : public ScriptedAI
 
     void JustSummoned(Creature *summon)
     {
-        if(summon && m_creature->getVictim())
+        if (summon && m_creature->getVictim())
             summon->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if( !UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if( CanSummon )
+        if (CanSummon)
         {
-            if( Summon_Timer < diff )
+            if (Summon_Timer < diff)
             {
                 DoScriptText(EMOTE_SUMMON, m_creature);
                 DoSummons();
@@ -165,20 +165,20 @@ struct TRINITY_DLL_DECL boss_lajAI : public ScriptedAI
             }else Summon_Timer -= diff;
         }
 
-        if( Allergic_Timer < diff )
+        if (Allergic_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_ALLERGIC_REACTION);
             Allergic_Timer = 25000+rand()%15000;
         }else Allergic_Timer -= diff;
 
-        if( Teleport_Timer < diff )
+        if (Teleport_Timer < diff)
         {
             DoCast(m_creature,SPELL_TELEPORT_SELF);
             Teleport_Timer = 30000+rand()%10000;
             CanSummon = true;
         }else Teleport_Timer -= diff;
 
-        if( Transform_Timer < diff )
+        if (Transform_Timer < diff)
         {
             DoTransform();
             Transform_Timer = 25000+rand()%15000;
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp
index 0a4f30581f1..083d596fd42 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/botanica/boss_warp_splinter.cpp
@@ -50,13 +50,13 @@ struct TRINITY_DLL_DECL mob_treantAI  : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
         {
-            if(WarpGuid && check_Timer < diff)
+            if (WarpGuid && check_Timer < diff)
             {
-                if(Unit *Warp = Unit::GetUnit(*m_creature, WarpGuid))
+                if (Unit *Warp = Unit::GetUnit(*m_creature, WarpGuid))
                 {
-                    if(m_creature->IsWithinMeleeRange(Warp,2.5f))
+                    if (m_creature->IsWithinMeleeRange(Warp,2.5f))
                     {
                         int32 CurrentHP_Treant = (int32)m_creature->GetHealth();
                         Warp->CastCustomSpell(Warp,SPELL_HEAL_FATHER,&CurrentHP_Treant, 0, 0, true,0 ,0, m_creature->GetGUID());
@@ -127,7 +127,7 @@ struct TRINITY_DLL_DECL boss_warp_splinterAI : public ScriptedAI
         Summon_Treants_Timer = 45000;
         Arcane_Volley_Timer = 8000 + rand()%12000;
 
-        m_creature->SetSpeed( MOVE_RUN, 0.7f, true);
+        m_creature->SetSpeed(MOVE_RUN, 0.7f, true);
     }
 
     void EnterCombat(Unit *who)
@@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL boss_warp_splinterAI : public ScriptedAI
             float Y = Treant_Spawn_Pos_Y + TREANT_SPAWN_DIST * sin(angle);
             float O = - m_creature->GetAngle(X,Y);
 
-            if(Creature *pTreant = m_creature->SummonCreature(CREATURE_TREANT,treant_pos[i][0],treant_pos[i][1],treant_pos[i][2],O,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,25000))
+            if (Creature *pTreant = m_creature->SummonCreature(CREATURE_TREANT,treant_pos[i][0],treant_pos[i][1],treant_pos[i][2],O,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,25000))
                 CAST_AI(mob_treantAI, pTreant->AI())->WarpGuid = m_creature->GetGUID();
         }
         switch(rand()%2)
@@ -171,25 +171,25 @@ struct TRINITY_DLL_DECL boss_warp_splinterAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Check for War Stomp
-        if(War_Stomp_Timer < diff)
+        if (War_Stomp_Timer < diff)
         {
             DoCast(m_creature->getVictim(),WAR_STOMP);
             War_Stomp_Timer = 25000 + rand()%15000;
         }else War_Stomp_Timer -= diff;
 
         //Check for Arcane Volley
-        if(Arcane_Volley_Timer < diff)
+        if (Arcane_Volley_Timer < diff)
         {
             DoCast(m_creature->getVictim(),ARCANE_VOLLEY);
             Arcane_Volley_Timer = 20000 + rand()%15000;
         }else Arcane_Volley_Timer -= diff;
 
         //Check for Summon Treants
-        if(Summon_Treants_Timer < diff)
+        if (Summon_Treants_Timer < diff)
         {
             SummonTreants();
             Summon_Treants_Timer = 45000;
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp
index a16799e7906..5972364350b 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp
@@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ALAREVENT, NOT_STARTED);
 
         Berserk_Timer = 1200000;
@@ -124,7 +124,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ALAREVENT, IN_PROGRESS);
 
         m_creature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING); // after enterevademode will be set walk movement
@@ -134,14 +134,14 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
 
     void JustDied(Unit *victim)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ALAREVENT, DONE);
     }
 
     void JustSummoned(Creature *summon)
     {
-        if(summon->GetEntry() == CREATURE_EMBER_OF_ALAR)
-            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+        if (summon->GetEntry() == CREATURE_EMBER_OF_ALAR)
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 summon->AI()->AttackStart(target);
     }
 
@@ -149,7 +149,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
 
     void AttackStart(Unit* who)
     {
-        if(Phase1)
+        if (Phase1)
             AttackStartNoMove(who);
         else
             ScriptedAI::AttackStart(who);
@@ -157,10 +157,10 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
 
     void DamageTaken(Unit* pKiller, uint32 &damage)
     {
-        if(damage >= m_creature->GetHealth() && Phase1)
+        if (damage >= m_creature->GetHealth() && Phase1)
         {
             damage = 0;
-            if(!WaitEvent)
+            if (!WaitEvent)
             {
                 WaitEvent = WE_DIE;
                 WaitTimer = 0;
@@ -179,7 +179,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
 
     void SpellHit(Unit*, const SpellEntry *spell)
     {
-        if(spell->Id == SPELL_DIVE_BOMB_VISUAL)
+        if (spell->Id == SPELL_DIVE_BOMB_VISUAL)
         {
             m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
             m_creature->SetDisplayId(11686);
@@ -189,7 +189,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
 
     void MovementInform(uint32 type, uint32 id)
     {
-        if(type == POINT_MOTION_TYPE)
+        if (type == POINT_MOTION_TYPE)
         {
             WaitTimer = 1;
             AfterMoving = true;
@@ -199,31 +199,31 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->isInCombat()) // sometimes isincombat but !incombat, faction bug?
+        if (!m_creature->isInCombat()) // sometimes isincombat but !incombat, faction bug?
             return;
 
-        if(Berserk_Timer < diff)
+        if (Berserk_Timer < diff)
         {
             m_creature->CastSpell(m_creature, SPELL_BERSERK, true);
             Berserk_Timer = 60000;
         }else Berserk_Timer -= diff;
 
-        if(ForceMove)
+        if (ForceMove)
         {
-            if(ForceTimer < diff)
+            if (ForceTimer < diff)
             {
                 m_creature->GetMotionMaster()->MovePoint(0, waypoint[cur_wp][0], waypoint[cur_wp][1], waypoint[cur_wp][2]);
                 ForceTimer = 5000;
             }else ForceTimer -= diff;
 
         }
-        if(WaitEvent)
+        if (WaitEvent)
         {
-            if(WaitTimer)
+            if (WaitTimer)
             {
-                if(WaitTimer <= diff)
+                if (WaitTimer <= diff)
                 {
-                    if(AfterMoving)
+                    if (AfterMoving)
                     {
                         m_creature->GetMotionMaster()->MoveIdle();
                         AfterMoving = false;
@@ -266,7 +266,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
                         WaitTimer = 4000;
                         return;
                     case WE_DIVE:
-                        if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                        if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                         {
                             m_creature->RemoveAurasDueToSpell(SPELL_DIVE_BOMB_VISUAL);
                             m_creature->CastSpell(target, SPELL_DIVE_BOMB, true);
@@ -306,27 +306,27 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
             return;
         }
 
-        if(Phase1)
+        if (Phase1)
         {
-            if(m_creature->getThreatManager().getThreatList().empty())
+            if (m_creature->getThreatManager().getThreatList().empty())
             {
                 EnterEvadeMode();
                 return;
             }
 
-            if(Platforms_Move_Timer < diff)
+            if (Platforms_Move_Timer < diff)
             {
-                if(cur_wp == 4)
+                if (cur_wp == 4)
                 {
                     cur_wp = 0;
                     WaitEvent = WE_PLATFORM;
                 }
                 else
                 {
-                    if(rand()%5) // next platform
+                    if (rand()%5) // next platform
                     {
                         DoSpawnCreature(CREATURE_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                        if(cur_wp == 3)
+                        if (cur_wp == 3)
                             cur_wp = 0;
                         else
                             cur_wp++;
@@ -347,24 +347,24 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
         }
         else
         {
-            if(!UpdateVictim())
+            if (!UpdateVictim())
                 return;
 
-            if(Charge_Timer < diff)
+            if (Charge_Timer < diff)
             {
                 Unit *target= SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true);
-                if(target)
+                if (target)
                     DoCast(target, SPELL_CHARGE);
                 Charge_Timer = 30000;
             }else Charge_Timer -= diff;
 
-            if(MeltArmor_Timer < diff)
+            if (MeltArmor_Timer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_MELT_ARMOR);
                 MeltArmor_Timer = 60000;
             }else MeltArmor_Timer -= diff;
 
-            if(DiveBomb_Timer < diff)
+            if (DiveBomb_Timer < diff)
             {
                 m_creature->AttackStop();
                 m_creature->GetMotionMaster()->MovePoint(6, waypoint[4][0], waypoint[4][1], waypoint[4][2]);
@@ -376,12 +376,12 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
                 return;
             }else DiveBomb_Timer -= diff;
 
-            if(FlamePatch_Timer < diff)
+            if (FlamePatch_Timer < diff)
             {
-                if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 {
                     Creature* Summoned = m_creature->SummonCreature(CREATURE_FLAME_PATCH_ALAR, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 120000);
-                    if(Summoned)
+                    if (Summoned)
                     {
                         Summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                         Summoned->SetFloatValue(OBJECT_FIELD_SCALE_X, Summoned->GetFloatValue(OBJECT_FIELD_SCALE_X)*2.5f);
@@ -400,9 +400,9 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
 
     void DoMeleeAttackIfReady()
     {
-        if(m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
+        if (m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
         {
-            if(m_creature->IsWithinMeleeRange(m_creature->getVictim()))
+            if (m_creature->IsWithinMeleeRange(m_creature->getVictim()))
             {
                 m_creature->AttackerStateUpdate(m_creature->getVictim());
                 m_creature->resetAttackTimer();
@@ -411,7 +411,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
             {
                 Unit *target = NULL;
                 target = m_creature->SelectNearestTarget(5);
-                if(Phase1 && target)
+                if (Phase1 && target)
                     m_creature->AI()->AttackStart(target);
                 else
                 {
@@ -446,18 +446,18 @@ struct TRINITY_DLL_DECL mob_ember_of_alarAI : public ScriptedAI
 
     void DamageTaken(Unit* pKiller, uint32 &damage)
     {
-        if(damage >= m_creature->GetHealth() && pKiller != m_creature && !toDie)
+        if (damage >= m_creature->GetHealth() && pKiller != m_creature && !toDie)
         {
             damage = 0;
             m_creature->CastSpell(m_creature, SPELL_EMBER_BLAST, true);
             m_creature->SetDisplayId(11686);
             m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-            if(pInstance && pInstance->GetData(DATA_ALAREVENT) == 2)
+            if (pInstance && pInstance->GetData(DATA_ALAREVENT) == 2)
             {
-                if(Unit* Alar = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_ALAR)))
+                if (Unit* Alar = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_ALAR)))
                 {
                     int AlarHealth = Alar->GetHealth() - Alar->GetMaxHealth()*0.03;
-                    if(AlarHealth > 0)
+                    if (AlarHealth > 0)
                         Alar->SetHealth(AlarHealth);
                     else
                         Alar->SetHealth(1);
@@ -469,10 +469,10 @@ struct TRINITY_DLL_DECL mob_ember_of_alarAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(toDie)
+        if (toDie)
         {
             m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
             //m_creature->SetVisibility(VISIBILITY_OFF);
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp
index 6a8655c3884..aacdcb70087 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp
@@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
         Phase = 1;
         Wrath_Timer = 20000+rand()%5000;//twice in phase one
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, NOT_STARTED);
 
         m_creature->SetArmor(defaultarmor);
@@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
         m_creature->SetDisplayId(MODEL_HUMAN);
         DoScriptText(SAY_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, DONE);
     }
 
@@ -163,7 +163,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
     void SummonMinion(uint32 entry, float x, float y, float z)
     {
         Creature* Summoned = m_creature->SummonCreature(entry, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-        if(Summoned)
+        if (Summoned)
         {
             if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 Summoned->AI()->AttackStart(target);
@@ -194,7 +194,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (AppearDelay)
@@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
                 BlindingLight_Timer = 45000;
             }else BlindingLight_Timer -= diff;
 
-            if( Wrath_Timer < diff)
+            if (Wrath_Timer < diff)
             {
                 m_creature->InterruptNonMeleeSpells(false);
                 DoCast(SelectTarget(SELECT_TARGET_RANDOM,1,100,true), SPELL_WRATH_OF_THE_ASTROMANCER, true);
@@ -229,17 +229,17 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
 
             if (ArcaneMissiles_Timer < diff)
             {
-                if(BlindingLight)
+                if (BlindingLight)
                 {
                     DoCast(m_creature->getVictim(), SPELL_BLINDING_LIGHT);
                     BlindingLight = false;
                 }else{
                     Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
 
-                    if(!m_creature->HasInArc(2.5f, target))
+                    if (!m_creature->HasInArc(2.5f, target))
                         target = m_creature->getVictim();
 
-                    if(target)
+                    if (target)
                         DoCast(target, SPELL_ARCANE_MISSILES);
                 }
                 ArcaneMissiles_Timer = 3000;
@@ -283,10 +283,10 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
                         Portals[i][2] = PORTAL_Z;
                     }
                 }
-                if((abs(Portals[2][0] - Portals[1][0]) < 7) && (abs(Portals[2][1] - Portals[1][1]) < 7))
+                if ((abs(Portals[2][0] - Portals[1][0]) < 7) && (abs(Portals[2][1] - Portals[1][1]) < 7))
                 {
                     int i=1;
-                    if(abs(CENTER_X + 26.0f - Portals[2][0]) < 7)
+                    if (abs(CENTER_X + 26.0f - Portals[2][0]) < 7)
                         i = -1;
                     Portals[2][0] = Portals[2][0]+7*i;
                     Portals[2][1] = Portal_Y(Portals[2][0], LARGE_PORTAL_RADIUS);
@@ -302,7 +302,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
                 AppearDelay = true;
             }else Phase1_Timer-=diff;
         }
-        else if(Phase == 2)
+        else if (Phase == 2)
         {
             //10 seconds after Solarian disappears, 12 mobs spawn out of the three portals.
             m_creature->AttackStop();
@@ -318,13 +318,13 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
                 Phase2_Timer = 10000;
             } else Phase2_Timer -= diff;
         }
-        else if(Phase == 3)
+        else if (Phase == 3)
         {
             m_creature->AttackStop();
             m_creature->StopMoving();
 
             //Check Phase3_Timer
-            if(Phase3_Timer < diff)
+            if (Phase3_Timer < diff)
             {
                 Phase = 1;
 
@@ -345,7 +345,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
                 Phase3_Timer = 15000;
             }else Phase3_Timer -= diff;
         }
-        else if(Phase == 4)
+        else if (Phase == 4)
         {
             //Fear_Timer
             if (Fear_Timer < diff)
@@ -363,7 +363,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
         }
 
         //When Solarian reaches 20% she will transform into a huge void walker.
-        if(Phase != 4 && ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth())<20))
+        if (Phase != 4 && ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth())<20))
         {
             Phase = 4;
 
@@ -417,7 +417,7 @@ struct TRINITY_DLL_DECL mob_solarium_priestAI : public ScriptedAI
             switch(rand()%2)
             {
                 case 0:
-                    if(pInstance)
+                    if (pInstance)
                         target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_ASTROMANCER));
                     break;
                 case 1:
@@ -425,14 +425,14 @@ struct TRINITY_DLL_DECL mob_solarium_priestAI : public ScriptedAI
                     break;
             }
 
-            if(target)
+            if (target)
             {
                 DoCast(target,SPELL_SOLARIUM_GREAT_HEAL);
                 healTimer = 9000;
             }
         } else healTimer -= diff;
 
-        if(holysmiteTimer < diff)
+        if (holysmiteTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SOLARIUM_HOLY_SMITE);
             holysmiteTimer = 4000;
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp
index 5bc50a88a5a..13011bf7672 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp
@@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI
         DoScriptText(SAY_DEATH, m_creature);
         DoZoneInCombat();
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_VOIDREAVEREVENT, DONE);
     }
 
@@ -92,17 +92,17 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI
     {
         DoScriptText(SAY_AGGRO, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_VOIDREAVEREVENT, IN_PROGRESS);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         // Pounding
-        if(Pounding_Timer < diff)
+        if (Pounding_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_POUNDING);
 
@@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI
         }else Pounding_Timer -= diff;
 
         // Arcane Orb
-        if(ArcaneOrb_Timer < diff)
+        if (ArcaneOrb_Timer < diff)
         {
             Unit *target = NULL;
             std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
@@ -128,12 +128,12 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI
                     continue;
 
                 //18 yard radius minimum
-                if(target && target->GetTypeId() == TYPEID_PLAYER && target->isAlive() && !target->IsWithinDist(m_creature, 18, false))
+                if (target && target->GetTypeId() == TYPEID_PLAYER && target->isAlive() && !target->IsWithinDist(m_creature, 18, false))
                     target_list.push_back(target);
                 target = NULL;
             }
 
-            if(target_list.size())
+            if (target_list.size())
                 target = *(target_list.begin()+rand()%target_list.size());
             else
                 target = m_creature->getVictim();
@@ -145,19 +145,19 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI
         }else ArcaneOrb_Timer -= diff;
 
         // Single Target knock back, reduces aggro
-        if(KnockAway_Timer < diff)
+        if (KnockAway_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_KNOCK_AWAY);
 
             //Drop 25% aggro
-            if(DoGetThreat(m_creature->getVictim()))
+            if (DoGetThreat(m_creature->getVictim()))
                 DoModifyThreatPercent(m_creature->getVictim(),-25);
 
             KnockAway_Timer = 30000;
         }else KnockAway_Timer -= diff;
 
         //Berserk
-        if(Berserk_Timer < diff && !Enraged)
+        if (Berserk_Timer < diff && !Enraged)
         {
             DoCast(m_creature,SPELL_BERSERK);
             Enraged = true;
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp
index ab2ca26a6f4..a930abc111f 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp
@@ -35,7 +35,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance
 {
-    instance_the_eye(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_the_eye(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint64 ThaladredTheDarkener;
     uint64 LordSanguinar;
@@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS) return true;
+            if (Encounters[i] == IN_PROGRESS) return true;
 
         return false;
     }
@@ -113,7 +113,7 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance
             case DATA_VOIDREAVEREVENT:  Encounters[2] = data;                               break;
             case DATA_KAELTHASEVENT:    KaelthasEventPhase = data;  Encounters[3] = data;   break;
         }
-        if(data == DONE)
+        if (data == DONE)
             SaveToDB();
     }
 
@@ -136,7 +136,7 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance
         stream << Encounters[0] << " " << Encounters[1] << " " << Encounters[2] << " " << Encounters[3];
         char* out = new char[stream.str().length() + 1];
         strcpy(out, stream.str().c_str());
-        if(out)
+        if (out)
         {
             OUT_SAVE_INST_DATA_COMPLETE;
             return out;
@@ -146,7 +146,7 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance
 
     void Load(const char* in)
     {
-        if(!in)
+        if (!in)
         {
             OUT_LOAD_INST_DATA_FAIL;
             return;
@@ -155,15 +155,15 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance
         std::istringstream stream(in);
         stream >> Encounters[0] >> Encounters[1] >> Encounters[2] >> Encounters[3];
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS)                // Do not load an encounter as "In Progress" - reset it instead.
+            if (Encounters[i] == IN_PROGRESS)                // Do not load an encounter as "In Progress" - reset it instead.
                 Encounters[i] = NOT_STARTED;
         OUT_LOAD_INST_DATA_COMPLETE;
     }
 };
 
-InstanceData* GetInstanceData_instance_the_eye(Map* map)
+InstanceData* GetInstanceData_instance_the_eye(Map* pMap)
 {
-    return new instance_the_eye(map);
+    return new instance_the_eye(pMap);
 }
 
 void AddSC_instance_the_eye()
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
index 952876157fa..0cf89e994da 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
@@ -93,18 +93,18 @@ struct TRINITY_DLL_DECL boss_gatewatcher_iron_handAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Shadow Power
-        if(Shadow_Power_Timer < diff)
+        if (Shadow_Power_Timer < diff)
         {
             DoCast(m_creature,HeroicMode ? H_SPELL_SHADOW_POWER : SPELL_SHADOW_POWER);
             Shadow_Power_Timer = 20000 + rand()%8000;
         }else Shadow_Power_Timer -= diff;
 
         //Jack Hammer
-        if(Jackhammer_Timer < diff)
+        if (Jackhammer_Timer < diff)
         {
             //TODO: expect cast this about 5 times in a row (?), announce it by emote only once
             DoScriptText(EMOTE_HAMMER, m_creature);
@@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL boss_gatewatcher_iron_handAI : public ScriptedAI
         }else Jackhammer_Timer -= diff;
 
         //Stream of Machine Fluid
-        if(Stream_of_Machine_Fluid_Timer < diff)
+        if (Stream_of_Machine_Fluid_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_STREAM_OF_MACHINE_FLUID);
             Stream_of_Machine_Fluid_Timer = 35000 + rand()%15000;
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
index 904ded07159..6bbff63e6a4 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
@@ -67,13 +67,13 @@ struct TRINITY_DLL_DECL boss_nethermancer_sepethreaAI : public ScriptedAI
         knockback_Timer = 22000 + rand()%6000;
         solarburn_Timer = 30000;
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_NETHERMANCER_EVENT, NOT_STARTED);
     }
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_NETHERMANCER_EVENT, IN_PROGRESS);
 
         DoScriptText(SAY_AGGRO, m_creature);
@@ -94,32 +94,32 @@ struct TRINITY_DLL_DECL boss_nethermancer_sepethreaAI : public ScriptedAI
     {
         DoScriptText(SAY_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_NETHERMANCER_EVENT, DONE);
     }
 
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Frost Attack
-        if(frost_attack_Timer < diff)
+        if (frost_attack_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_FROST_ATTACK);
             frost_attack_Timer = 7000 + rand()%3000;
         }else frost_attack_Timer -= diff;
 
         //Arcane Blast
-        if(arcane_blast_Timer < diff)
+        if (arcane_blast_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_ARCANE_BLAST);
             arcane_blast_Timer = 15000;
         }else arcane_blast_Timer -= diff;
 
         //Dragons Breath
-        if(dragons_breath_Timer < diff)
+        if (dragons_breath_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_DRAGONS_BREATH);
             {
@@ -136,14 +136,14 @@ struct TRINITY_DLL_DECL boss_nethermancer_sepethreaAI : public ScriptedAI
         }else dragons_breath_Timer -= diff;
 
         //Knockback
-        if(knockback_Timer < diff)
+        if (knockback_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_KNOCKBACK);
             knockback_Timer = 15000 + rand()%10000;
         }else knockback_Timer -= diff;
 
         //Solarburn
-        if(solarburn_Timer < diff)
+        if (solarburn_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_SOLARBURN);
             solarburn_Timer = 30000;
@@ -197,11 +197,11 @@ struct TRINITY_DLL_DECL mob_ragin_flamesAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
          //Check_Timer
-        if(Check_Timer < diff)
+        if (Check_Timer < diff)
         {
-            if(pInstance)
+            if (pInstance)
             {
-                if(pInstance->GetData(DATA_NETHERMANCER_EVENT) != IN_PROGRESS)
+                if (pInstance->GetData(DATA_NETHERMANCER_EVENT) != IN_PROGRESS)
                 {
                     //remove
                     m_creature->setDeathState(JUST_DIED);
@@ -221,14 +221,14 @@ struct TRINITY_DLL_DECL mob_ragin_flamesAI : public ScriptedAI
             onlyonce = true;
         }
 
-        if(inferno_Timer < diff)
+        if (inferno_Timer < diff)
         {
             DoCast(m_creature->getVictim(),HeroicMode ? H_SPELL_INFERNO : SPELL_INFERNO);
             m_creature->TauntApply(m_creature->getVictim());
             inferno_Timer = 10000;
         }else inferno_Timer -= diff;
 
-        if(flame_timer < diff)
+        if (flame_timer < diff)
         {
             DoCast(m_creature,SPELL_FIRE_TAIL);
             flame_timer = 500;
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
index 8650c1bcf40..0ffb5fa511e 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
@@ -106,10 +106,10 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(Summon_Timer < diff)
+        if (Summon_Timer < diff)
         {
             for(uint8 i = 0; i < 3; ++i)
             {
@@ -122,19 +122,19 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI
             Summon_Timer = 30000 + rand()%15000;
         }else Summon_Timer -= diff;
 
-        if(ManaTap_Timer < diff)
+        if (ManaTap_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_MANA_TAP);
             ManaTap_Timer = 14000 + rand()%8000;
         }else ManaTap_Timer -= diff;
 
-        if(ArcaneTorrent_Timer < diff)
+        if (ArcaneTorrent_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_ARCANE_TORRENT);
             ArcaneTorrent_Timer = 12000 + rand()%6000;
         }else ArcaneTorrent_Timer -= diff;
 
-        if(Domination_Timer < diff)
+        if (Domination_Timer < diff)
         {
             if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1))
             {
@@ -152,7 +152,7 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI
         //Only casting if Heroic Mode is used
         if (HeroicMode)
         {
-            if(ArcaneExplosion_Timer < diff)
+            if (ArcaneExplosion_Timer < diff)
             {
                 DoCast(m_creature->getVictim(),H_SPELL_ARCANE_EXPLOSION);
                 ArcaneExplosion_Timer = 10000 + rand()%4000;
@@ -204,7 +204,7 @@ struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(ArcaneMissiles_Timer < diff)
+        if (ArcaneMissiles_Timer < diff)
         {
             if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,1))
                 DoCast(target,SPELL_ARCANE_MISSILES);
@@ -216,7 +216,7 @@ struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI
 
         if (!Detonation)
         {
-            if(Detonation_Timer < diff)
+            if (Detonation_Timer < diff)
             {
                 DoCast(m_creature,SPELL_DETONATION);
                 Detonation = true;
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp
index 907cf6c67d5..6a4194bbc7c 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp
@@ -28,7 +28,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_mechanar : public ScriptedInstance
 {
-    instance_mechanar(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_mechanar(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
 
     uint32 Encounters[ENCOUNTERS];
@@ -42,7 +42,7 @@ struct TRINITY_DLL_DECL instance_mechanar : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS)
+            if (Encounters[i] == IN_PROGRESS)
                 return true;
 
         return false;
@@ -72,9 +72,9 @@ struct TRINITY_DLL_DECL instance_mechanar : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_mechanar(Map* map)
+InstanceData* GetInstanceData_instance_mechanar(Map* pMap)
 {
-    return new instance_mechanar(map);
+    return new instance_mechanar(pMap);
 }
 
 void AddSC_instance_mechanar()
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp
index 6d97b192962..14cf0226b8d 100644
--- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp
+++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp
@@ -67,9 +67,9 @@ struct TRINITY_DLL_DECL boss_kriAI : public ScriptedAI
 
     void JustDied(Unit* killer)
     {
-        if(pInstance)
+        if (pInstance)
         {
-            if(pInstance->GetData(DATA_BUG_TRIO_DEATH) < 2)
+            if (pInstance->GetData(DATA_BUG_TRIO_DEATH) < 2)
                                                             // Unlootable if death
                 m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
 
@@ -102,12 +102,12 @@ struct TRINITY_DLL_DECL boss_kriAI : public ScriptedAI
             Death = true;
         }
 
-        if(!VemDead)
+        if (!VemDead)
         {
             //Checking if Vem is dead. If yes we will enrage.
-            if(Check_Timer < diff)
+            if (Check_Timer < diff)
             {
-                if(pInstance && pInstance->GetData(DATA_VEMISDEAD))
+                if (pInstance && pInstance->GetData(DATA_VEMISDEAD))
                 {
                     DoCast(m_creature, SPELL_ENRAGE);
                     VemDead = true;
@@ -146,10 +146,10 @@ struct TRINITY_DLL_DECL boss_vemAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(DATA_VEM_DEATH, 0);
-            if(pInstance->GetData(DATA_BUG_TRIO_DEATH) < 2)
+            if (pInstance->GetData(DATA_BUG_TRIO_DEATH) < 2)
                                                             // Unlootable if death
                 m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
             pInstance->SetData(DATA_BUG_TRIO_DEATH, 1);
@@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL boss_vemAI : public ScriptedAI
         {
             Unit* target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM,0);
-            if(target)
+            if (target)
             {
                 DoCast(target, SPELL_CHARGE);
                 //m_creature->SendMonsterMove(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, true,1);
@@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL boss_vemAI : public ScriptedAI
         if (KnockBack_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_KNOCKBACK);
-            if(DoGetThreat(m_creature->getVictim()))
+            if (DoGetThreat(m_creature->getVictim()))
                 DoModifyThreatPercent(m_creature->getVictim(),-80);
             KnockBack_Timer = 15000 + rand()%10000;
         }else KnockBack_Timer -= diff;
@@ -227,9 +227,9 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if(pInstance)
+        if (pInstance)
         {
-            if(pInstance->GetData(DATA_BUG_TRIO_DEATH) < 2)
+            if (pInstance->GetData(DATA_BUG_TRIO_DEATH) < 2)
                                                             // Unlootable if death
                 m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
             pInstance->SetData(DATA_BUG_TRIO_DEATH, 1);
@@ -239,7 +239,7 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI
         {
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0);
             Creature* Summoned = m_creature->SummonCreature(15621,m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,90000);
-            if(Summoned && target)
+            if (Summoned && target)
                 (Summoned->AI())->AttackStart(target);
         }
     }
@@ -263,9 +263,9 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI
         }else Fear_Timer -= diff;
 
         //Casting Heal to other twins or herself.
-        if(Heal_Timer < diff)
+        if (Heal_Timer < diff)
         {
-            if(pInstance)
+            if (pInstance)
             {
                 Unit *pKri = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_KRI));
                 Unit *pVem = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_VEM));
@@ -273,11 +273,11 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI
                 switch(rand()%3)
                 {
                     case 0:
-                        if(pKri)
+                        if (pKri)
                             DoCast(pKri, SPELL_HEAL);
                         break;
                     case 1:
-                        if(pVem)
+                        if (pVem)
                             DoCast(pVem, SPELL_HEAL);
                         break;
                     case 2:
@@ -290,13 +290,13 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI
         }else Heal_Timer -= diff;
 
         //Checking if Vem is dead. If yes we will enrage.
-        if(Check_Timer < diff)
+        if (Check_Timer < diff)
         {
             if (!VemDead)
             {
-                if(pInstance)
+                if (pInstance)
                 {
-                    if(pInstance->GetData(DATA_VEMISDEAD))
+                    if (pInstance->GetData(DATA_VEMISDEAD))
                     {
                         DoCast(m_creature, SPELL_ENRAGE);
                         VemDead = true;
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp
index 08bf13b9810..e3f67e7ba00 100644
--- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp
+++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp
@@ -551,7 +551,7 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI
 
         //Get random but only if we have more than one unit on threat list
         if (temp.size() > 1)
-            advance ( i , rand() % (temp.size() - 1) );
+            advance (i , rand() % (temp.size() - 1));
 
         return (*j);
     }
@@ -565,11 +565,11 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI
             //WisperTimer
             if (WisperTimer < diff)
             {
-                Map *map = m_creature->GetMap();
-                if(!map->IsDungeon()) return;
+                Map* pMap = m_creature->GetMap();
+                if (!pMap->IsDungeon()) return;
 
                 //Play random sound to the zone
-                Map::PlayerList const &PlayerList = map->GetPlayers();
+                Map::PlayerList const &PlayerList = pMap->GetPlayers();
 
                 if (!PlayerList.isEmpty())
                 {
@@ -612,7 +612,7 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI
                     m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
 
                     //Emerging phase
-                    //AttackStart(Unit::GetUnit(*m_creature, HoldPlayer));
+                    //AttackStart(Unit::GetUnit(*m_creature, HoldpPlayer));
                     DoZoneInCombat();
 
                     //Place all units in threat list on outside of stomach
@@ -870,7 +870,7 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI
     void JustDied(Unit* pKiller)
     {
         //Switch
-        if( pInst )
+        if (pInst)
             pInst->SetData(DATA_CTHUN_PHASE, 5);
     }
 
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp
index ac50457c5fc..b7827507d8e 100644
--- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp
+++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_fankriss.cpp
@@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_fankrissAI : public ScriptedAI
 
     void SummonSpawn(Unit* victim)
     {
-        if(!victim)
+        if (!victim)
             return;
 
         Rand = 10 + (rand()%10);
@@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_fankrissAI : public ScriptedAI
         }
         Rand = 0;
         Spawn = DoSpawnCreature(15630, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
-        if(Spawn)
+        if (Spawn)
             (Spawn->AI())->AttackStart(victim);
     }
 
@@ -120,9 +120,9 @@ struct TRINITY_DLL_DECL boss_fankrissAI : public ScriptedAI
 
         // Teleporting Random Target to one of the three tunnels and spawn 4 hatchlings near the gamer.
         //We will only telport if fankriss has more than 3% of hp so teleported gamers can always loot.
-        if ( m_creature->GetHealth()*100 / m_creature->GetMaxHealth() > 3 )
+        if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() > 3)
         {
-            if(SpawnHatchlings_Timer< diff)
+            if (SpawnHatchlings_Timer< diff)
             {
                 Unit* target = NULL;
                 target = SelectUnit(SELECT_TARGET_RANDOM,0);
@@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL boss_fankrissAI : public ScriptedAI
                 {
                     DoCast(target, SPELL_ROOT);
 
-                    if(DoGetThreat(target))
+                    if (DoGetThreat(target))
                         DoModifyThreatPercent(target, -100);
 
                     switch(rand()%3)
@@ -138,46 +138,46 @@ struct TRINITY_DLL_DECL boss_fankrissAI : public ScriptedAI
                         case 0:
                             DoTeleportPlayer(target, -8106.0142,1289.2900,-74.419533,5.112);
                             Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()-3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                            if(Hatchling)
+                            if (Hatchling)
                                 (Hatchling->AI())->AttackStart(target);
                             Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()+3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                            if(Hatchling)
+                            if (Hatchling)
                                 (Hatchling->AI())->AttackStart(target);
                             Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()-5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                            if(Hatchling)
+                            if (Hatchling)
                                 (Hatchling->AI())->AttackStart(target);
                             Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()+5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                            if(Hatchling)
+                            if (Hatchling)
                                 (Hatchling->AI())->AttackStart(target);
                             break;
                         case 1:
                             DoTeleportPlayer(target, -7990.135354,1155.1907,-78.849319,2.608);
                             Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()-3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                            if(Hatchling)
+                            if (Hatchling)
                                 (Hatchling->AI())->AttackStart(target);
                             Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()+3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                            if(Hatchling)
+                            if (Hatchling)
                                 (Hatchling->AI())->AttackStart(target);
                             Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()-5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                            if(Hatchling)
+                            if (Hatchling)
                                 (Hatchling->AI())->AttackStart(target);
                             Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()+5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                            if(Hatchling)
+                            if (Hatchling)
                                 (Hatchling->AI())->AttackStart(target);
                             break;
                         case 2:
                             DoTeleportPlayer(target,-8159.7753,1127.9064,-76.868660,0.675);
                             Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()-3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                            if(Hatchling)
+                            if (Hatchling)
                                 (Hatchling->AI())->AttackStart(target);
                             Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-3, target->GetPositionY()+3, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                            if(Hatchling)
+                            if (Hatchling)
                                 (Hatchling->AI())->AttackStart(target);
                             Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()-5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                            if(Hatchling)
+                            if (Hatchling)
                                 (Hatchling->AI())->AttackStart(target);
                             Hatchling = m_creature->SummonCreature(15962, target->GetPositionX()-5, target->GetPositionY()+5, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                            if(Hatchling)
+                            if (Hatchling)
                                 (Hatchling->AI())->AttackStart(target);
                             break;
                     }
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp
index dd5e9aabee4..6eac0f176b3 100644
--- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp
+++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_huhuran.cpp
@@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL boss_huhuranAI : public ScriptedAI
         // Wyvern Timer
         if (Wyvern_Timer < diff)
         {
-            if( Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0) )
+            if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 DoCast(target,SPELL_WYVERNSTING);
             Wyvern_Timer = 15000 + rand()%17000;
         }else Wyvern_Timer -= diff;
@@ -120,7 +120,7 @@ struct TRINITY_DLL_DECL boss_huhuranAI : public ScriptedAI
             FrenzyBack_Timer = 15000;
         }else FrenzyBack_Timer -= diff;
 
-        if ( !Berserk && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 31 )
+        if (!Berserk && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 31)
         {
             m_creature->InterruptNonMeleeSpells(false);
             DoScriptText(EMOTE_GENERIC_BERSERK, m_creature);
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp
index 9a59c5b7dbc..98e50dbb94f 100644
--- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp
+++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_ouro.cpp
@@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL boss_ouroAI : public ScriptedAI
             Unit* target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM,0);
 
-            if(target)
+            if (target)
                 DoTeleportTo(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ());
 
             ChangeTarget_Timer = 10000 + rand()%10000;
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp
index d8d5a7e09b7..f17cbc7a231 100644
--- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp
+++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp
@@ -135,10 +135,10 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI
         }else ArcaneExplosion_Timer -= diff;
 
         //If we are within range melee the target
-        if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
+        if (m_creature->IsWithinMeleeRange(m_creature->getVictim()))
         {
             //Make sure our attack is ready and we arn't currently casting
-            if( m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
+            if (m_creature->isAttackReady() && !m_creature->IsNonMeleeSpellCasted(false))
             {
                 m_creature->AttackerStateUpdate(m_creature->getVictim());
                 m_creature->resetAttackTimer();
@@ -180,16 +180,16 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI
         int procent = (int) (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() +0.5);
 
         //Summoning 2 Images and teleporting to a random position on 75% health
-        if ( (!Images75 && !IsImage) && (procent <= 75 && procent > 70) )
+        if ((!Images75 && !IsImage) && (procent <= 75 && procent > 70))
             DoSplit(75);
 
         //Summoning 2 Images and teleporting to a random position on 50% health
-        if ( (!Images50 && !IsImage) &&
-            (procent <= 50 && procent > 45) )
+        if ((!Images50 && !IsImage) &&
+            (procent <= 50 && procent > 45))
             DoSplit(50);
 
         //Summoning 2 Images and teleporting to a random position on 25% health
-        if ( (!Images25 && !IsImage) && (procent <= 25 && procent > 20) )
+        if ((!Images25 && !IsImage) && (procent <= 25 && procent > 20))
             DoSplit(25);
 
         //Invisible_Timer
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp
index bc675d892dc..c6f27cf706e 100644
--- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp
+++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp
@@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI
 
     Creature *GetOtherBoss()
     {
-        if(pInstance)
+        if (pInstance)
         {
             return Unit::GetCreature(*m_creature, pInstance->GetData64(IAmVeklor() ? DATA_VEKNILASH : DATA_VEKLOR));
         }
@@ -212,7 +212,7 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI
 
         Teleport_Timer = TELEPORTTIME;
 
-        if(IAmVeklor())
+        if (IAmVeklor())
             return;                                         // mechanics handled by veknilash so they teleport exactly at the same time and to correct coordinates
 
         Creature *pOtherBoss = GetOtherBoss();
@@ -265,7 +265,7 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI
                 m_creature->clearUnitState(UNIT_STAT_STUNNED);
                 Unit *nearu = m_creature->SelectNearestTarget(100);
                 //DoYell(nearu->GetName(), LANG_UNIVERSAL, 0);
-                if(nearu)
+                if (nearu)
                 {
                     AttackStart(nearu);
                     m_creature->getThreatManager().addThreat(nearu, 10000);
@@ -305,7 +305,7 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI
                 attackRadius = PULL_RANGE;
             if (m_creature->IsWithinDistInMap(who, attackRadius) && m_creature->GetDistanceZ(who) <= /*CREATURE_Z_ATTACK_RANGE*/7 /*there are stairs*/)
             {
-                //if(who->HasStealthAura())
+                //if (who->HasStealthAura())
                 //    who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
                 AttackStart(who);
             }
@@ -328,7 +328,7 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI
             Creature *c = *iter;
             if (c)
             {
-                if(c->isDead())
+                if (c->isDead())
                 {
                     c->Respawn();
                     c->setFaction(7);
@@ -458,7 +458,7 @@ struct TRINITY_DLL_DECL boss_veknilashAI : public boss_twinemperorsAI
         TryHealBrother(diff);
 
         //Teleporting to brother
-        if(Teleport_Timer < diff)
+        if (Teleport_Timer < diff)
         {
             TeleportToMyBrother();
         }else Teleport_Timer -= diff;
@@ -563,7 +563,7 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI
         TryHealBrother(diff);
 
         //Teleporting to brother
-        if(Teleport_Timer < diff)
+        if (Teleport_Timer < diff)
         {
             TeleportToMyBrother();
         }else Teleport_Timer -= diff;
@@ -582,7 +582,7 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI
         if (who->isTargetableForAttack())
         {
             // VL doesn't melee
-            if ( m_creature->Attack(who, false) )
+            if (m_creature->Attack(who, false))
             {
                 m_creature->GetMotionMaster()->MoveChase(who, VEKLOR_DIST, 0);
                 m_creature->AddThreat(who, 0.0f);
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
index 9b5a3f4f5f3..3640436cff8 100644
--- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
@@ -26,7 +26,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_temple_of_ahnqiraj : public ScriptedInstance
 {
-    instance_temple_of_ahnqiraj(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_temple_of_ahnqiraj(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     //If Vem is dead...
     bool IsBossDied[3];
@@ -82,17 +82,17 @@ struct TRINITY_DLL_DECL instance_temple_of_ahnqiraj : public ScriptedInstance
         switch(type)
         {
             case DATA_VEMISDEAD:
-                if(IsBossDied[0])
+                if (IsBossDied[0])
                     return 1;
                 break;
 
             case DATA_VEKLORISDEAD:
-                if(IsBossDied[1])
+                if (IsBossDied[1])
                     return 1;
                 break;
 
             case DATA_VEKNILASHISDEAD:
-                if(IsBossDied[2])
+                if (IsBossDied[2])
                     return 1;
                 break;
 
@@ -150,9 +150,9 @@ struct TRINITY_DLL_DECL instance_temple_of_ahnqiraj : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_temple_of_ahnqiraj(Map* map)
+InstanceData* GetInstanceData_instance_temple_of_ahnqiraj(Map* pMap)
 {
-    return new instance_temple_of_ahnqiraj(map);
+    return new instance_temple_of_ahnqiraj(pMap);
 }
 
 void AddSC_instance_temple_of_ahnqiraj()
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
index a824bbc634c..8237a0babdc 100644
--- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
+++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
@@ -142,7 +142,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
                 if (!c->isInCombat())
                 {
                     c->SetNoCallAssistance(true);
-                    if(c->AI())
+                    if (c->AI())
                         c->AI()->AttackStart(who);
                 }
             }
diff --git a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp
index f9c283b0224..63003ab47c9 100644
--- a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp
+++ b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp
@@ -79,26 +79,26 @@ struct TRINITY_DLL_DECL mob_unkor_the_ruthlessAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if( done_by->GetTypeId() == TYPEID_PLAYER )
-            if( (m_creature->GetHealth()-damage)*100 / m_creature->GetMaxHealth() < 30 )
+        if (done_by->GetTypeId() == TYPEID_PLAYER)
+            if ((m_creature->GetHealth()-damage)*100 / m_creature->GetMaxHealth() < 30)
         {
-            if( Group* pGroup = CAST_PLR(done_by)->GetGroup() )
+            if (Group* pGroup = CAST_PLR(done_by)->GetGroup())
             {
                 for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
                 {
                     Player *pGroupie = itr->getSource();
-                    if( pGroupie &&
+                    if (pGroupie &&
                         pGroupie->GetQuestStatus(QUEST_DONTKILLTHEFATONE) == QUEST_STATUS_INCOMPLETE &&
-                        pGroupie->GetReqKillOrCastCurrentCount(QUEST_DONTKILLTHEFATONE, 18260) == 10 )
+                        pGroupie->GetReqKillOrCastCurrentCount(QUEST_DONTKILLTHEFATONE, 18260) == 10)
                     {
                         pGroupie->AreaExploredOrEventHappens(QUEST_DONTKILLTHEFATONE);
-                        if( !CanDoQuest )
+                        if (!CanDoQuest)
                             CanDoQuest = true;
                     }
                 }
             } else
-            if( CAST_PLR(done_by)->GetQuestStatus(QUEST_DONTKILLTHEFATONE) == QUEST_STATUS_INCOMPLETE &&
-                CAST_PLR(done_by)->GetReqKillOrCastCurrentCount(QUEST_DONTKILLTHEFATONE, 18260) == 10 )
+            if (CAST_PLR(done_by)->GetQuestStatus(QUEST_DONTKILLTHEFATONE) == QUEST_STATUS_INCOMPLETE &&
+                CAST_PLR(done_by)->GetReqKillOrCastCurrentCount(QUEST_DONTKILLTHEFATONE, 18260) == 10)
             {
                 CAST_PLR(done_by)->AreaExploredOrEventHappens(QUEST_DONTKILLTHEFATONE);
                 CanDoQuest = true;
@@ -108,16 +108,16 @@ struct TRINITY_DLL_DECL mob_unkor_the_ruthlessAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if( CanDoQuest )
+        if (CanDoQuest)
         {
-            if( !UnkorUnfriendly_Timer )
+            if (!UnkorUnfriendly_Timer)
             {
                 //DoCast(m_creature,SPELL_QUID9889);        //not using spell for now
                 DoNice();
             }
             else
             {
-                if( UnkorUnfriendly_Timer < diff )
+                if (UnkorUnfriendly_Timer < diff)
                 {
                     EnterEvadeMode();
                     return;
@@ -125,10 +125,10 @@ struct TRINITY_DLL_DECL mob_unkor_the_ruthlessAI : public ScriptedAI
             }
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if( Pulverize_Timer < diff )
+        if (Pulverize_Timer < diff)
         {
             DoCast(m_creature,SPELL_PULVERIZE);
             Pulverize_Timer = 9000;
@@ -180,7 +180,7 @@ public:
     void WaypointReached(uint32 i)
     {
         Player *pPlayer = Unit::GetPlayer(PlayerGUID);
-        if( !pPlayer )
+        if (!pPlayer)
             return;
 
         switch(i)
@@ -195,15 +195,15 @@ public:
 
     void MoveInLineOfSight(Unit *who)
     {
-        if( IsBeingEscorted )
+        if (IsBeingEscorted)
             return;
 
-        if( who->GetTypeId() == TYPEID_PLAYER )
+        if (who->GetTypeId() == TYPEID_PLAYER)
         {
-            if( CAST_PLR(who)->GetQuestStatus(10898) == QUEST_STATUS_INCOMPLETE )
+            if (CAST_PLR(who)->GetQuestStatus(10898) == QUEST_STATUS_INCOMPLETE)
             {
                 float Radius = 10.0;
-                if( m_creature->IsWithinDistInMap(who, Radius) )
+                if (m_creature->IsWithinDistInMap(who, Radius))
                 {
                     Start(false, false, who->GetGUID());
                 }
@@ -274,11 +274,11 @@ struct TRINITY_DLL_DECL mob_netherweb_victimAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if( Killer->GetTypeId() == TYPEID_PLAYER )
+        if (Killer->GetTypeId() == TYPEID_PLAYER)
         {
-            if( CAST_PLR(Killer)->GetQuestStatus(10873) == QUEST_STATUS_INCOMPLETE )
+            if (CAST_PLR(Killer)->GetQuestStatus(10873) == QUEST_STATUS_INCOMPLETE)
             {
-                if( rand()%100 < 25 )
+                if (rand()%100 < 25)
                 {
                     m_creature->SummonCreature(QUEST_TARGET, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
                     CAST_PLR(Killer)->KilledMonsterCredit(QUEST_TARGET, m_creature->GetGUID());
@@ -286,7 +286,7 @@ struct TRINITY_DLL_DECL mob_netherweb_victimAI : public ScriptedAI
                 else
                     m_creature->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
 
-                if( rand()%100 < 75 )
+                if (rand()%100 < 75)
                     m_creature->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f,0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
                 m_creature->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
             }
@@ -342,22 +342,22 @@ struct TRINITY_DLL_DECL npc_floonAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if( Silence_Timer < diff )
+        if (Silence_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_SILENCE);
             Silence_Timer = 30000;
         }else Silence_Timer -= diff;
 
-        if( FrostNova_Timer < diff )
+        if (FrostNova_Timer < diff)
         {
             DoCast(m_creature,SPELL_FROST_NOVA);
             FrostNova_Timer = 20000;
         }else FrostNova_Timer -= diff;
 
-        if( Frostbolt_Timer < diff )
+        if (Frostbolt_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_FROSTBOLT);
             Frostbolt_Timer = 5000;
@@ -372,28 +372,28 @@ CreatureAI* GetAI_npc_floon(Creature *_Creature)
     return new npc_floonAI (_Creature);
 }
 
-bool GossipHello_npc_floon(Player *player, Creature *_Creature )
+bool GossipHello_npc_floon(Player* pPlayer, Creature *_Creature)
 {
-    if( player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(9442, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(9442, _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_floon(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_floon(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_INFO_DEF )
+    if (action == GOSSIP_ACTION_INFO_DEF)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->SEND_GOSSIP_MENU(9443, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->SEND_GOSSIP_MENU(9443, _Creature->GetGUID());
     }
-    if( action == GOSSIP_ACTION_INFO_DEF+1 )
+    if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->CLOSE_GOSSIP_MENU();
+        pPlayer->CLOSE_GOSSIP_MENU();
         _Creature->setFaction(FACTION_HOSTILE_FL);
-        DoScriptText(SAY_FLOON_ATTACK, _Creature, player);
-        _Creature->AI()->AttackStart(player);
+        DoScriptText(SAY_FLOON_ATTACK, _Creature, pPlayer);
+        _Creature->AI()->AttackStart(pPlayer);
     }
     return true;
 }
@@ -420,9 +420,9 @@ struct TRINITY_DLL_DECL npc_isla_starmaneAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if(!player)
+        if (!pPlayer)
             return;
 
         switch(i)
@@ -430,21 +430,21 @@ struct TRINITY_DLL_DECL npc_isla_starmaneAI : public npc_escortAI
         case 0:
             {
             GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 10);
-            if(Cage)
+            if (Cage)
                 Cage->SetGoState(GO_STATE_ACTIVE);
             }break;
-        case 2: DoScriptText(SAY_PROGRESS_1, m_creature, player); break;
-        case 5: DoScriptText(SAY_PROGRESS_2, m_creature, player); break;
-        case 6: DoScriptText(SAY_PROGRESS_3, m_creature, player); break;
-        case 29:DoScriptText(SAY_PROGRESS_4, m_creature, player);
-            if (player)
+        case 2: DoScriptText(SAY_PROGRESS_1, m_creature, pPlayer); break;
+        case 5: DoScriptText(SAY_PROGRESS_2, m_creature, pPlayer); break;
+        case 6: DoScriptText(SAY_PROGRESS_3, m_creature, pPlayer); break;
+        case 29:DoScriptText(SAY_PROGRESS_4, m_creature, pPlayer);
+            if (pPlayer)
             {
-                if(CAST_PLR(player)->GetTeam() == ALLIANCE)
-                    CAST_PLR(player)->GroupEventHappens(QUEST_EFTW_A, m_creature);
-                else if(CAST_PLR(player)->GetTeam() == HORDE)
-                    CAST_PLR(player)->GroupEventHappens(QUEST_EFTW_H, m_creature);
+                if (CAST_PLR(pPlayer)->GetTeam() == ALLIANCE)
+                    CAST_PLR(pPlayer)->GroupEventHappens(QUEST_EFTW_A, m_creature);
+                else if (CAST_PLR(pPlayer)->GetTeam() == HORDE)
+                    CAST_PLR(pPlayer)->GroupEventHappens(QUEST_EFTW_H, m_creature);
             } Completed = true;
-            m_creature->SetInFront(player); break;
+            m_creature->SetInFront(pPlayer); break;
         case 30: m_creature->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break;
         case 31: DoCast(m_creature, SPELL_CAT);
             m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break;
@@ -463,13 +463,13 @@ struct TRINITY_DLL_DECL npc_isla_starmaneAI : public npc_escortAI
     {
         if (PlayerGUID)
         {
-            Player* player = Unit::GetPlayer(PlayerGUID);
-            if (player && !Completed)
+            Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+            if (pPlayer && !Completed)
             {
-                if(CAST_PLR(player)->GetTeam() == ALLIANCE)
-                    CAST_PLR(player)->FailQuest(QUEST_EFTW_A);
-                else if(CAST_PLR(player)->GetTeam() == HORDE)
-                    CAST_PLR(player)->FailQuest(QUEST_EFTW_H);
+                if (CAST_PLR(pPlayer)->GetTeam() == ALLIANCE)
+                    CAST_PLR(pPlayer)->FailQuest(QUEST_EFTW_A);
+                else if (CAST_PLR(pPlayer)->GetTeam() == HORDE)
+                    CAST_PLR(pPlayer)->FailQuest(QUEST_EFTW_H);
             }
         }
     }
@@ -480,11 +480,11 @@ struct TRINITY_DLL_DECL npc_isla_starmaneAI : public npc_escortAI
     }
 };
 
-bool QuestAccept_npc_isla_starmane(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_isla_starmane(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_EFTW_H || quest->GetQuestId() == QUEST_EFTW_A)
     {
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
         creature->setFaction(113);
     }
     return true;
@@ -541,44 +541,44 @@ CreatureAI* GetAI_npc_isla_starmaneAI(Creature *_Creature)
 #define GOSSIP_S_GEZZARAK_THE_HUNTRESS         "Summon Gezzarak the Huntress"
 #define GOSSIP_S_VAKKIZ_THE_WINDRAGER         "Summon Vakkiz the Windrager"
 
-bool GossipHello_go_skull_pile(Player *player, GameObject* _GO)
+bool GossipHello_go_skull_pile(Player* pPlayer, GameObject* _GO)
 {
-    if ((player->GetQuestStatus(11885) == QUEST_STATUS_INCOMPLETE) || player->GetQuestRewardStatus(11885))
+    if ((pPlayer->GetQuestStatus(11885) == QUEST_STATUS_INCOMPLETE) || pPlayer->GetQuestRewardStatus(11885))
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_DARKSCREECHER_AKKARAI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_KARROG, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_GEZZARAK_THE_HUNTRESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_VAKKIZ_THE_WINDRAGER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_DARKSCREECHER_AKKARAI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_KARROG, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_GEZZARAK_THE_HUNTRESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_VAKKIZ_THE_WINDRAGER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
     }
 
-    player->SEND_GOSSIP_MENU(_GO->GetGOInfo()->questgiver.gossipID, _GO->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_GO->GetGOInfo()->questgiver.gossipID, _GO->GetGUID());
     return true;
 }
 
-void SendActionMenu_go_skull_pile(Player *player, GameObject* _GO, uint32 action)
+void SendActionMenu_go_skull_pile(Player* pPlayer, GameObject* _GO, uint32 action)
 {
     switch(action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:
-              player->CastSpell(player,40642,false);
+              pPlayer->CastSpell(pPlayer,40642,false);
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-              player->CastSpell(player,40640,false);
+              pPlayer->CastSpell(pPlayer,40640,false);
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
-              player->CastSpell(player,40632,false);
+              pPlayer->CastSpell(pPlayer,40632,false);
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:
-              player->CastSpell(player,40644,false);
+              pPlayer->CastSpell(pPlayer,40644,false);
             break;
     }
 }
 
-bool GossipSelect_go_skull_pile(Player *player, GameObject* _GO, uint32 sender, uint32 action )
+bool GossipSelect_go_skull_pile(Player* pPlayer, GameObject* _GO, uint32 sender, uint32 action)
 {
     switch(sender)
     {
-        case GOSSIP_SENDER_MAIN:    SendActionMenu_go_skull_pile(player, _GO, action); break;
+        case GOSSIP_SENDER_MAIN:    SendActionMenu_go_skull_pile(pPlayer, _GO, action); break;
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp
index a5d2a9d12f3..4bd2cfe78f3 100644
--- a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp
+++ b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp
@@ -46,15 +46,15 @@ npc_swiftmountainAI(Creature *c) : npc_escortAI(c) {}
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!player)
+        if (!pPlayer)
             return;
 
         switch (i)
         {
         case 46:
-            DoScriptText(SAY_AGGRO, m_creature, player);
+            DoScriptText(SAY_AGGRO, m_creature, pPlayer);
             break;
          case 47:
             m_creature->SummonCreature(ENTRY_WYVERN, -5016.45, -935.01, -5.46, 5.36,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
@@ -62,9 +62,9 @@ npc_swiftmountainAI(Creature *c) : npc_escortAI(c) {}
             m_creature->SummonCreature(ENTRY_WYVERN, -4999.06, -949.61, -5.42, 2.04,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
             break;
          case 70:
-            DoScriptText(SAY_FINISH, m_creature, player);
-            if (player && player->GetTypeId() == TYPEID_PLAYER)
-                CAST_PLR(player)->GroupEventHappens(QUEST_HOMEWARD_BOUND,m_creature);
+            DoScriptText(SAY_FINISH, m_creature, pPlayer);
+            if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)
+                CAST_PLR(pPlayer)->GroupEventHappens(QUEST_HOMEWARD_BOUND,m_creature);
             break;
 
         }
@@ -86,8 +86,8 @@ npc_swiftmountainAI(Creature *c) : npc_escortAI(c) {}
     {
         if (PlayerGUID)
         {
-            if (Player* player = Unit::GetPlayer(PlayerGUID))
-                CAST_PLR(player)->FailQuest(QUEST_HOMEWARD_BOUND);
+            if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
+                CAST_PLR(pPlayer)->FailQuest(QUEST_HOMEWARD_BOUND);
         }
     }
 
@@ -97,12 +97,12 @@ npc_swiftmountainAI(Creature *c) : npc_escortAI(c) {}
     }
 };
 
-bool QuestAccept_npc_swiftmountain(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_swiftmountain(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_HOMEWARD_BOUND)
     {
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID());
-        DoScriptText(SAY_READY, creature, player);
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
+        DoScriptText(SAY_READY, creature, pPlayer);
         creature->setFaction(113);
     }
 
@@ -273,22 +273,22 @@ struct TRINITY_DLL_DECL npc_pluckyAI : public ScriptedAI
     }
 };
 
-bool GossipHello_npc_plucky(Player *player, Creature *_Creature)
+bool GossipHello_npc_plucky(Player* pPlayer, Creature *_Creature)
 {
-    if(player->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_P, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-    player->SEND_GOSSIP_MENU(738, _Creature->GetGUID());
+    if (pPlayer->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_P, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    pPlayer->SEND_GOSSIP_MENU(738, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_plucky(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_plucky(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    switch( action )
+    switch(action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->CLOSE_GOSSIP_MENU();
-            player->CompleteQuest(QUEST_SCOOP);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->CompleteQuest(QUEST_SCOOP);
         break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp
index 8b525a6ef6e..cd0335f4df8 100644
--- a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp
+++ b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp
@@ -58,36 +58,36 @@ struct TRINITY_DLL_DECL npc_cairne_bloodhoofAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if( BerserkerCharge_Timer < diff )
+        if (BerserkerCharge_Timer < diff)
         {
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0);
-            if( target )
+            if (target)
                 DoCast(target,SPELL_BERSERKER_CHARGE);
             BerserkerCharge_Timer = 25000;
         }else BerserkerCharge_Timer -= diff;
 
-        if( Uppercut_Timer < diff )
+        if (Uppercut_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_UPPERCUT);
             Uppercut_Timer = 20000;
         }else Uppercut_Timer -= diff;
 
-        if( Thunderclap_Timer < diff )
+        if (Thunderclap_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP);
             Thunderclap_Timer = 15000;
         }else Thunderclap_Timer -= diff;
 
-        if( MortalStrike_Timer < diff )
+        if (MortalStrike_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_MORTAL_STRIKE);
             MortalStrike_Timer = 15000;
         }else MortalStrike_Timer -= diff;
 
-        if( Cleave_Timer < diff )
+        if (Cleave_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_CLEAVE);
             Cleave_Timer = 7000;
@@ -101,25 +101,25 @@ CreatureAI* GetAI_npc_cairne_bloodhoof(Creature *_Creature)
     return new npc_cairne_bloodhoofAI (_Creature);
 }
 
-bool GossipHello_npc_cairne_bloodhoof(Player *player, Creature *_Creature)
+bool GossipHello_npc_cairne_bloodhoof(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if( player->GetQuestStatus(925) == QUEST_STATUS_INCOMPLETE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HCB, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO );
+    if (pPlayer->GetQuestStatus(925) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HCB, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO);
 
-    player->SEND_GOSSIP_MENU(7013, _Creature->GetGUID() );
+    pPlayer->SEND_GOSSIP_MENU(7013, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_cairne_bloodhoof(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_cairne_bloodhoof(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_SENDER_INFO )
+    if (action == GOSSIP_SENDER_INFO)
     {
-        player->CastSpell(player, 23123, false);
-        player->SEND_GOSSIP_MENU(7014, _Creature->GetGUID() );
+        pPlayer->CastSpell(pPlayer, 23123, false);
+        pPlayer->SEND_GOSSIP_MENU(7014, _Creature->GetGUID());
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp
index 08e88782580..bc484f91818 100644
--- a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp
+++ b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp
@@ -134,7 +134,7 @@ CreatureAI* GetAI_npc_calvin_montague(Creature *_Creature)
 
 bool QuestAccept_npc_calvin_montague(Player* pPlayer, Creature* pCreature, Quest const* quest)
 {
-    if( quest->GetQuestId() == QUEST_590 )
+    if (quest->GetQuestId() == QUEST_590)
     {
         pCreature->setFaction(FACTION_HOSTILE);
         pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
diff --git a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp
index 042a0643594..0bf25a257c2 100644
--- a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp
+++ b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp
@@ -118,7 +118,7 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!pInstance)
+        if (!pInstance)
             return;
         // we're still doing awaken animation
         if (wakingUp && Awaken_Timer >= 0) {
@@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI
         } else WallMinionTimer -= diff;
 
         //If we are <66 summon the guardians
-        if ( !guardiansAwake && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 66) {
+        if (!guardiansAwake && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 66) {
             ActivateMinion(pInstance->GetData64(5),true);   // EarthenGuardian1
             ActivateMinion(pInstance->GetData64(6),true);   // EarthenGuardian2
             ActivateMinion(pInstance->GetData64(7),true);   // EarthenGuardian3
@@ -156,7 +156,7 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI
         }
 
         //If we are <33 summon the vault walkers
-        if ( !vaultWalkersAwake && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 33) {
+        if (!vaultWalkersAwake && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 33) {
             ActivateMinion(pInstance->GetData64(1),true);    // VaultWalker1
             ActivateMinion(pInstance->GetData64(2),true);    // VaultWalker2
             ActivateMinion(pInstance->GetData64(3),true);    // VaultWalker3
@@ -180,7 +180,7 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI
     }
 
     void JustDied (Unit *killer) {
-        if(pInstance)
+        if (pInstance)
         {
             pInstance->SetData(NULL,3);        // open the vault door
             pInstance->SetData(NULL,4);        // deactivate his minions
@@ -251,7 +251,7 @@ struct TRINITY_DLL_DECL mob_archaedas_minionsAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(amIAwake)
+        if (amIAwake)
             ScriptedAI::MoveInLineOfSight(who);
     }
 
@@ -300,19 +300,19 @@ uint64 altarOfArchaedasCount[5];
 int32 altarOfArchaedasCounter=0;
 
 
-bool GOHello_go_altar_of_archaedas(Player *player, GameObject* go)
+bool GOHello_go_altar_of_archaedas(Player* pPlayer, GameObject* go)
 {
     bool alreadyUsed;
     go->AddUse ();
 
     alreadyUsed = false;
     for (uint32 loop=0; loop<5; loop++) {
-        if (altarOfArchaedasCount[loop] == player->GetGUID()) alreadyUsed = true;
+        if (altarOfArchaedasCount[loop] == pPlayer->GetGUID()) alreadyUsed = true;
     }
     if (!alreadyUsed)
-        altarOfArchaedasCount[altarOfArchaedasCounter++] = player->GetGUID();
+        altarOfArchaedasCount[altarOfArchaedasCounter++] = pPlayer->GetGUID();
 
-    player->CastSpell (player, SPELL_BOSS_OBJECT_VISUAL, false);
+    pPlayer->CastSpell (pPlayer, SPELL_BOSS_OBJECT_VISUAL, false);
 
     if (altarOfArchaedasCounter < NUMBER_NEEDED_TO_ACTIVATE) {
         return false;        // not enough people yet
@@ -322,7 +322,7 @@ bool GOHello_go_altar_of_archaedas(Player *player, GameObject* go)
     uint32 count=0;
     Unit *pTarget;
     for (uint32 x=0; x<=5; x++) {
-        pTarget = Unit::GetUnit(*player, altarOfArchaedasCount[x]);
+        pTarget = Unit::GetUnit(*pPlayer, altarOfArchaedasCount[x]);
         if (!pTarget) continue;
         if (pTarget->IsNonMeleeSpellCasted(true)) count++;
         if (count >= NUMBER_NEEDED_TO_ACTIVATE) break;
@@ -332,10 +332,10 @@ bool GOHello_go_altar_of_archaedas(Player *player, GameObject* go)
         return false;            // not enough people
     }
 
-    ScriptedInstance* pInstance = (player->GetInstanceData());
+    ScriptedInstance* pInstance = (pPlayer->GetInstanceData());
     if (!pInstance) return false;
     pInstance->SetData(NULL,0);
-    pInstance->SetData64(0,player->GetGUID());     // activate archaedas
+    pInstance->SetData64(0,pPlayer->GetGUID());     // activate archaedas
 
     return false;
 }
@@ -388,7 +388,7 @@ struct TRINITY_DLL_DECL mob_stonekeepersAI : public ScriptedAI
     void JustDied(Unit *attacker)
     {
         DoCast (m_creature, SPELL_SELF_DESTRUCT,true);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(NULL, 1);    // activate next stonekeeper
     }
 
@@ -414,9 +414,9 @@ EndScriptData */
 static uint64 altarOfTheKeeperCount[5];
 static uint32 altarOfTheKeeperCounter=0;
 
-bool GOHello_go_altar_of_the_keepers(Player *player, GameObject* go)
+bool GOHello_go_altar_of_the_keepers(Player* pPlayer, GameObject* go)
 {
-    ScriptedInstance* pInstance = (player->GetInstanceData());
+    ScriptedInstance* pInstance = (pPlayer->GetInstanceData());
     if (!pInstance) return true;
 
     bool alreadyUsed;
@@ -426,12 +426,12 @@ bool GOHello_go_altar_of_the_keepers(Player *player, GameObject* go)
     alreadyUsed = false;
     for (uint32 loop=0; loop<5; ++loop)
     {
-        if (altarOfTheKeeperCount[loop] == player->GetGUID())
+        if (altarOfTheKeeperCount[loop] == pPlayer->GetGUID())
             alreadyUsed = true;
     }
     if (!alreadyUsed && altarOfTheKeeperCounter < 5)
-        altarOfTheKeeperCount[altarOfTheKeeperCounter++] = player->GetGUID();
-    player->CastSpell (player, SPELL_BOSS_OBJECT_VISUAL, false);
+        altarOfTheKeeperCount[altarOfTheKeeperCounter++] = pPlayer->GetGUID();
+    pPlayer->CastSpell (pPlayer, SPELL_BOSS_OBJECT_VISUAL, false);
 
     if (altarOfTheKeeperCounter < NUMBER_NEEDED_TO_ACTIVATE)
     {
@@ -444,7 +444,7 @@ bool GOHello_go_altar_of_the_keepers(Player *player, GameObject* go)
     Unit *pTarget;
     for (uint32 x = 0; x < 5; ++x)
     {
-        pTarget = Unit::GetUnit(*player, altarOfTheKeeperCount[x]);
+        pTarget = Unit::GetUnit(*pPlayer, altarOfTheKeeperCount[x]);
         //error_log ("number of people currently activating it: %d", x+1);
         if (!pTarget) continue;
         if (pTarget->IsNonMeleeSpellCasted(true)) count++;
diff --git a/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp b/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp
index 119d0b1c885..033eed0a737 100644
--- a/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp
+++ b/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp
@@ -31,7 +31,7 @@
 
 struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
 {
-    instance_uldaman(Map *map) : ScriptedInstance(map)
+    instance_uldaman(Map* pMap) : ScriptedInstance(pMap)
     {
         Initialize();
     };
@@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
     void OpenDoor(uint64 guid)
     {
         GameObject *go = instance->GetGameObject(guid);
-        if(!go)
+        if (!go)
             return;
 
         go->SetUInt32Value(GAMEOBJECT_FLAGS, 33);
@@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
     void ActivateWallMinions()
     {
         Creature *archaedas = instance->GetCreature(archaedasGUID);
-        if(!archaedas)
+        if (!archaedas)
             return;
 
         for(std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
@@ -166,10 +166,10 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
     void ActivateArchaedas(uint64 target)
     {
         Creature *archaedas = instance->GetCreature(archaedasGUID);
-        if(!archaedas)
+        if (!archaedas)
             return;
 
-        if(Unit *victim = Unit::GetUnit(*archaedas, target))
+        if (Unit *victim = Unit::GetUnit(*archaedas, target))
         {
             archaedas->CastSpell(archaedas, SPELL_ARCHAEDAS_AWAKEN,false);
             whoWokeArchaedasGUID = target;
@@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
     void SetData64 (uint32 type, uint64 data)
     {
         // Archaedas
-        if (type==0 )
+        if (type==0)
         {
             ActivateArchaedas (data);
         }
@@ -290,9 +290,9 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
 
 
 
-InstanceData* GetInstanceData_instance_uldaman(Map* map)
+InstanceData* GetInstanceData_instance_uldaman(Map* pMap)
 {
-    return new instance_uldaman(map);
+    return new instance_uldaman(pMap);
 }
 
 void AddSC_instance_uldaman()
diff --git a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp
index 7355c2f9eb0..5ff1d5439c8 100644
--- a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp
+++ b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp
@@ -88,83 +88,83 @@ CreatureAI* GetAI_mob_jadespine_basilisk(Creature *_Creature)
 ## npc_lore_keeper_of_norgannon
 ######*/
 
-bool GossipHello_npc_lore_keeper_of_norgannon(Player *player, Creature *_Creature)
+bool GossipHello_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature *_Creature)
 {
-    if (player->GetQuestStatus(2278) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Who are the Earthen?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    if (pPlayer->GetQuestStatus(2278) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Who are the Earthen?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
-    player->SEND_GOSSIP_MENU(1079, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(1079, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_lore_keeper_of_norgannon(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What is a \"subterranean being matrix\"?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-            player->SEND_GOSSIP_MENU(1080, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What is a \"subterranean being matrix\"?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+            pPlayer->SEND_GOSSIP_MENU(1080, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What are the anomalies you speak of?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-            player->SEND_GOSSIP_MENU(1081, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What are the anomalies you speak of?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+            pPlayer->SEND_GOSSIP_MENU(1081, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What is a resilient foundation of construction?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
-            player->SEND_GOSSIP_MENU(1082, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What is a resilient foundation of construction?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+            pPlayer->SEND_GOSSIP_MENU(1082, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "So... the Earthen were made out of stone?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-            player->SEND_GOSSIP_MENU(1083, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "So... the Earthen were made out of stone?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            pPlayer->SEND_GOSSIP_MENU(1083, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Anything else I should know about the Earthen?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
-            player->SEND_GOSSIP_MENU(1084, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Anything else I should know about the Earthen?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
+            pPlayer->SEND_GOSSIP_MENU(1084, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+6:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I think I understand the Creators' design intent for the Earthen now. What are the Earthen's anomalies that you spoke of earlier?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
-            player->SEND_GOSSIP_MENU(1085, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I think I understand the Creators' design intent for the Earthen now. What are the Earthen's anomalies that you spoke of earlier?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
+            pPlayer->SEND_GOSSIP_MENU(1085, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+7:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What high-stress environments would cause the Earthen to destabilize?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8);
-            player->SEND_GOSSIP_MENU(1086, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What high-stress environments would cause the Earthen to destabilize?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8);
+            pPlayer->SEND_GOSSIP_MENU(1086, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+8:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What happens when the Earthen destabilize?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
-            player->SEND_GOSSIP_MENU(1087, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What happens when the Earthen destabilize?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
+            pPlayer->SEND_GOSSIP_MENU(1087, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+9:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Troggs?! Are the troggs you mention the same as the ones in the world today?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10);
-            player->SEND_GOSSIP_MENU(1088, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Troggs?! Are the troggs you mention the same as the ones in the world today?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10);
+            pPlayer->SEND_GOSSIP_MENU(1088, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+10:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "You mentioned two results when the Earthen destabilize. What is the second?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+11);
-            player->SEND_GOSSIP_MENU(1089, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "You mentioned two results when the Earthen destabilize. What is the second?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+11);
+            pPlayer->SEND_GOSSIP_MENU(1089, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+11:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Dwarves!!! Now you're telling me that dwarves originally came from the Earthen?!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+12);
-            player->SEND_GOSSIP_MENU(1090, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Dwarves!!! Now you're telling me that dwarves originally came from the Earthen?!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+12);
+            pPlayer->SEND_GOSSIP_MENU(1090, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+12:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "These dwarves are the same ones today, yes? Do the dwarves maintain any other links to the Earthen?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+13);
-            player->SEND_GOSSIP_MENU(1091, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "These dwarves are the same ones today, yes? Do the dwarves maintain any other links to the Earthen?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+13);
+            pPlayer->SEND_GOSSIP_MENU(1091, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+13:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Who are the Creators?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+14);
-            player->SEND_GOSSIP_MENU(1092, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Who are the Creators?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+14);
+            pPlayer->SEND_GOSSIP_MENU(1092, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+14:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "This is a lot to think about.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+15);
-            player->SEND_GOSSIP_MENU(1093, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "This is a lot to think about.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+15);
+            pPlayer->SEND_GOSSIP_MENU(1093, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+15:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will access the discs now.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+16);
-            player->SEND_GOSSIP_MENU(1094, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will access the discs now.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+16);
+            pPlayer->SEND_GOSSIP_MENU(1094, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+16:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(2278);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(2278);
             break;
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_loken.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_loken.cpp
index fa31dafe2a6..164b393b6d9 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_loken.cpp
+++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_loken.cpp
@@ -58,7 +58,7 @@ enum
 
 struct TRINITY_DLL_DECL boss_lokenAI : public ScriptedAI
 {
-    boss_lokenAI(Creature *pCreature) : ScriptedAI(pCreature)
+    boss_lokenAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
         m_pInstance = pCreature->GetInstanceData();
         m_bIsHeroic = pCreature->GetMap()->IsHeroic();
@@ -109,15 +109,15 @@ struct TRINITY_DLL_DECL boss_lokenAI : public ScriptedAI
     {
         DoScriptText(SAY_DEATH, m_creature);
 
-        if(m_bIsHeroic && EncounterTimer <= 120000)
+        if (m_bIsHeroic && EncounterTimer <= 120000)
         {
             AchievementEntry const *AchievTimelyDeath = GetAchievementStore()->LookupEntry(ACHIEVEMENT_TIMELY_DEATH);
-            if(AchievTimelyDeath)
+            if (AchievTimelyDeath)
             {
-                Map *map = m_creature->GetMap();
-                if(map && map->IsDungeon())
+                Map* pMap = m_creature->GetMap();
+                if (pMap && pMap->IsDungeon())
                 {
-                    Map::PlayerList const &players = map->GetPlayers();
+                    Map::PlayerList const &players = pMap->GetPlayers();
                     for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievTimelyDeath);
                 }
@@ -141,10 +141,10 @@ struct TRINITY_DLL_DECL boss_lokenAI : public ScriptedAI
     void UpdateAI(const uint32 uiDiff) 
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
  
-        if(EncounterTimer)
+        if (EncounterTimer)
             EncounterTimer += uiDiff;
 
         if (m_bIsAura)
@@ -152,10 +152,10 @@ struct TRINITY_DLL_DECL boss_lokenAI : public ScriptedAI
             // workaround for PULSING_SHOCKWAVE
             if (m_uiPulsingShockwave_Timer < uiDiff)
             {
-                Map *map = m_creature->GetMap();
-                if (map->IsDungeon())
+                Map* pMap = m_creature->GetMap();
+                if (pMap->IsDungeon())
                 {
-                    Map::PlayerList const &PlayerList = map->GetPlayers();
+                    Map::PlayerList const &PlayerList = pMap->GetPlayers();
 
                     if (PlayerList.isEmpty())
                         return;
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp
index 911cfcdb6d0..20b24f0640b 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp
+++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_krystallus.cpp
@@ -40,7 +40,7 @@ struct TRINITY_DLL_DECL boss_krystallusAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
@@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL boss_krystallusAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         DoScriptText(SAY_KILL, m_creature);
     }
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
index 0a84e8114aa..6ca5dd5c9d2 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
+++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
@@ -43,7 +43,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
@@ -54,7 +54,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%3)
         {
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp
index 99cd73c7a33..c7745f6713e 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp
+++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/boss_sjonnir.cpp
@@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
@@ -56,7 +56,7 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%3)
         {
diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/instance_halls_of_stone.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/instance_halls_of_stone.cpp
index 8ca1d2b606f..fa2dd83637f 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/instance_halls_of_stone.cpp
+++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_stone/instance_halls_of_stone.cpp
@@ -3,12 +3,12 @@
 
 struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance
 {
-    instance_halls_of_stone(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_halls_of_stone(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 };
 
-InstanceData* GetInstanceData_instance_halls_of_stone(Map* map)
+InstanceData* GetInstanceData_instance_halls_of_stone(Map* pMap)
 {
-    return new instance_halls_of_stone(map);
+    return new instance_halls_of_stone(pMap);
 }
 
 void AddSC_instance_halls_of_stone()
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_auriaya.cpp b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_auriaya.cpp
index 502dd0b215f..62cef5ee5a1 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_auriaya.cpp
+++ b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_auriaya.cpp
@@ -56,17 +56,17 @@ struct TRINITY_DLL_DECL boss_auriaya_AI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if( TERRIFYING_SCREECH_Timer < diff )
+        if (TERRIFYING_SCREECH_Timer < diff)
         {
             DoCast(m_creature,SPELL_TERRIFYING_SCREECH);
             DoScriptText(SAY_SLAY_1, m_creature);
             TERRIFYING_SCREECH_Timer = 360000;
         } else TERRIFYING_SCREECH_Timer -= diff;
 
-        if( SONIC_BOOM_Timer < diff )
+        if (SONIC_BOOM_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_SONIC_BOOM);
             SONIC_BOOM_Timer = 20000;
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_flame_leviathan.cpp b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_flame_leviathan.cpp
index 677095c791d..4680f71c626 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_flame_leviathan.cpp
+++ b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_flame_leviathan.cpp
@@ -55,23 +55,23 @@ struct TRINITY_DLL_DECL boss_flame_leviathanAI : public BossAI
         events.ScheduleEvent(EVENT_PURSUE, 0);
         events.ScheduleEvent(EVENT_MISSILE, 1500);
         events.ScheduleEvent(EVENT_VENT, 20000);
-        if(Creature *turret = CAST_CRE(CAST_VEH(me)->GetPassenger(7)))
+        if (Creature *turret = CAST_CRE(CAST_VEH(me)->GetPassenger(7)))
             turret->AI()->DoZoneInCombat();
     }
 
     // TODO: effect 0 and effect 1 may be on different target
     void SpellHitTarget(Unit *target, const SpellEntry *spell)
     {
-        if(spell->Id == SPELL_PURSUED)
+        if (spell->Id == SPELL_PURSUED)
             AttackStart(target);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!me->isInCombat())
+        if (!me->isInCombat())
             return;
 
-        if(me->getThreatManager().isThreatListEmpty())
+        if (me->getThreatManager().isThreatListEmpty())
         {
             EnterEvadeMode();
             return;
@@ -79,11 +79,11 @@ struct TRINITY_DLL_DECL boss_flame_leviathanAI : public BossAI
 
         events.Update(diff);
 
-        if(me->hasUnitState(UNIT_STAT_CASTING))
+        if (me->hasUnitState(UNIT_STAT_CASTING))
             return;
 
         uint32 eventId = events.GetEvent();
-        if(!me->getVictim())
+        if (!me->getVictim())
             eventId = EVENT_PURSUE;
 
         switch(eventId)
@@ -135,15 +135,15 @@ struct TRINITY_DLL_DECL boss_flame_leviathan_turretAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateCombatState())
+        if (!UpdateCombatState())
             return;
 
         events.Update(diff);
 
-        if(me->hasUnitState(UNIT_STAT_CASTING))
+        if (me->hasUnitState(UNIT_STAT_CASTING))
             return;
 
-        if(uint32 eventId = events.GetEvent())
+        if (uint32 eventId = events.GetEvent())
         {
             switch(eventId)
             {
@@ -165,7 +165,7 @@ struct TRINITY_DLL_DECL boss_flame_leviathan_seatAI : public ScriptedAI
     boss_flame_leviathan_seatAI(Creature *c) : ScriptedAI(c)
     {
         assert(c->isVehicle());
-        if(const CreatureInfo *cInfo = me->GetCreatureInfo())
+        if (const CreatureInfo *cInfo = me->GetCreatureInfo())
             me->SetDisplayId(cInfo->DisplayID_A[0]); // 0 invisible, 1 visible
     }
 
@@ -176,15 +176,15 @@ struct TRINITY_DLL_DECL boss_flame_leviathan_seatAI : public ScriptedAI
 
     void MoveInLineOfSight(Unit *who) // for test
     {
-        if(who->GetTypeId() == TYPEID_PLAYER && !who->m_Vehicle
+        if (who->GetTypeId() == TYPEID_PLAYER && !who->m_Vehicle
             && !CAST_VEH(me)->GetPassenger(0) && CAST_VEH(me)->GetPassenger(2))
             who->EnterVehicle(CAST_VEH(me), 0);
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if(!CAST_VEH(me)->GetPassenger(2))
-            if(Unit *who = CAST_VEH(me)->GetPassenger(0))
+        if (!CAST_VEH(me)->GetPassenger(2))
+            if (Unit *who = CAST_VEH(me)->GetPassenger(0))
                 who->ExitVehicle();
     }
 };
@@ -201,16 +201,16 @@ struct TRINITY_DLL_DECL boss_flame_leviathan_defense_turretAI : public ScriptedA
 
     void DamageTaken(Unit *who, uint32 &damage)
     {
-        if(!who->m_Vehicle || who->m_Vehicle->GetEntry() != 33114)
+        if (!who->m_Vehicle || who->m_Vehicle->GetEntry() != 33114)
             damage = 0;
     }
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(me->getVictim())
+        if (me->getVictim())
             return;
 
-        if(who->GetTypeId() != TYPEID_PLAYER || !who->m_Vehicle || who->m_Vehicle->GetEntry() != 33114)
+        if (who->GetTypeId() != TYPEID_PLAYER || !who->m_Vehicle || who->m_Vehicle->GetEntry() != 33114)
             return;
 
         AttackStart(who);
@@ -218,10 +218,10 @@ struct TRINITY_DLL_DECL boss_flame_leviathan_defense_turretAI : public ScriptedA
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(me->hasUnitState(UNIT_STAT_CASTING))
+        if (me->hasUnitState(UNIT_STAT_CASTING))
             return;
 
         DoCast(me->getVictim(), SPELL_SEARING_FLAME);
@@ -232,7 +232,7 @@ struct TRINITY_DLL_DECL boss_flame_leviathan_overload_deviceAI : public Scripted
 {
     boss_flame_leviathan_overload_deviceAI(Creature *c) : ScriptedAI(c)
     {
-        if(const CreatureInfo *cInfo = me->GetCreatureInfo())
+        if (const CreatureInfo *cInfo = me->GetCreatureInfo())
             me->SetDisplayId(cInfo->DisplayID_H[0]); // A0 gm, H0 device
     }
 
@@ -242,10 +242,10 @@ struct TRINITY_DLL_DECL boss_flame_leviathan_overload_deviceAI : public Scripted
 
     void DamageTaken(Unit *who, uint32 &damage)
     {
-        if(damage >= me->GetHealth())
+        if (damage >= me->GetHealth())
         {
             damage = 0;
-            if(!me->hasUnitState(UNIT_STAT_CASTING))
+            if (!me->hasUnitState(UNIT_STAT_CASTING))
                 DoCastAOE(SPELL_OVERLOAD_CIRCUIT);
         }
     }
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_ignis.cpp b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_ignis.cpp
index f6f8c973f1a..657ce25ca3e 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_ignis.cpp
+++ b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_ignis.cpp
@@ -59,23 +59,23 @@ struct TRINITY_DLL_DECL boss_ignis_AI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if( FLAME_JETS_Timer < diff )
+        if (FLAME_JETS_Timer < diff)
         {
             DoCast(m_creature,SPELL_FLAME_JETS);
             DoScriptText(SAY_SLAY, m_creature);
             FLAME_JETS_Timer = 25000;
         } else FLAME_JETS_Timer -= diff;
 
-        if( SCORCH_Timer < diff )
+        if (SCORCH_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_SCORCH);
             SCORCH_Timer = 20000;
         } else SCORCH_Timer -= diff;
 
-        if( SLAG_POT_Timer < diff )
+        if (SLAG_POT_Timer < diff)
         {
             DoCast(m_creature,SPELL_SLAG_POT);
             DoScriptText(SAY_SLAY, m_creature);
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_razorscale.cpp b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_razorscale.cpp
index c2641680891..272857fd850 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_razorscale.cpp
+++ b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_razorscale.cpp
@@ -119,10 +119,10 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 99) && (Phase == 1))
+        if (((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 99) && (Phase == 1))
         {
             Phase = 2;
             m_creature->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
@@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public ScriptedAI
             DoScriptText(SAY_PHASE_2_TRANS, m_creature);
         }
 
-        if(((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50) && (Phase == 2))
+        if (((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 50) && (Phase == 2))
         {
             Phase = 3;
             m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
@@ -144,54 +144,54 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public ScriptedAI
             m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
         }
 
-        if(Phase == 1 || Phase == 3)
+        if (Phase == 1 || Phase == 3)
         {
-            if(FlameBreathTimer < diff)
+            if (FlameBreathTimer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_FLAMEBREATH);
                 FlameBreathTimer = 15000;
             } else FlameBreathTimer -= diff;
 
-            if(DEVOURINGFLAMETimer < diff)
+            if (DEVOURINGFLAMETimer < diff)
             {
                 Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-                if(target && !m_creature->HasInArc(M_PI, target))
+                if (target && !m_creature->HasInArc(M_PI, target))
                     DoCast(target, SPELL_DEVOURINGFLAME);
 
                 DEVOURINGFLAMETimer = 10000;
             } else DEVOURINGFLAMETimer -= diff;
 
-            if(FUSEARMORTimer < diff)
+            if (FUSEARMORTimer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_FUSEARMOR);
                 FUSEARMORTimer = 10000;
             } else FUSEARMORTimer -= diff;
 
-            if(WingBuffetTimer < diff)
+            if (WingBuffetTimer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_WINGBUFFET);
                 WingBuffetTimer = 7000 + ((rand()%8)*1000);
             } else WingBuffetTimer -= diff;
 
-            if(KnockAwayTimer < diff)
+            if (KnockAwayTimer < diff)
             {
-                if(rand()%100 <= 30)
+                if (rand()%100 <= 30)
                 {
                     DoCast(m_creature->getVictim(), SPELL_KNOCK_AWAY);
                 }
                 KnockAwayTimer = 15000;
             } else KnockAwayTimer -= diff;
 
-            if(Phase == 3)
+            if (Phase == 3)
             {
-                if(BellowingRoarTimer < diff)
+                if (BellowingRoarTimer < diff)
                 {
                     DoCast(m_creature->getVictim(), SPELL_BELLOWINGROAR);
 
                     BellowingRoarTimer = 30000;
                 } else BellowingRoarTimer -= diff;
 
-                if(SummonAddsTimer < diff)
+                if (SummonAddsTimer < diff)
                 {
                     SummonAdds(Phase);
 
@@ -202,9 +202,9 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public ScriptedAI
             DoMeleeAttackIfReady();
         }
 
-        if(Phase == 2)
+        if (Phase == 2)
         {
-            if(InitialSpawn)
+            if (InitialSpawn)
             {
                 InitialSpawn = false;
 
@@ -212,22 +212,22 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public ScriptedAI
                 {
                     uint32 random = rand()%4;
                     Creature* Add = m_creature->SummonCreature(CREATURE_ADDS, SpawnLocations[random][0], SpawnLocations[random][1], SpawnLocations[random][2], 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
-                    if(Add)
+                    if (Add)
                         Add->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
                 }
             }
 
 
-            if(FireballTimer < diff)
+            if (FireballTimer < diff)
             {
                 DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_FIREBALL);
 
                 FireballTimer = 18000;
             } else FireballTimer -= diff;
 
-            if(MovementTimer < diff)
+            if (MovementTimer < diff)
             {
-                if(rand()%100 <= 30)
+                if (rand()%100 <= 30)
                 {
                     DoScriptText(EMOTE_BREATH, m_creature);
                     DoCast(m_creature->getVictim(), SPELL_FLAMEBUFFET);
@@ -237,7 +237,7 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public ScriptedAI
                 MovementTimer = 25000;
             } else MovementTimer -= diff;
 
-            if(SummonAddsTimer < diff)
+            if (SummonAddsTimer < diff)
             {
                 SummonAdds(Phase);
 
@@ -250,34 +250,34 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public ScriptedAI
     {
         /* Malfunctioning, Razorscale is flying around randomly, attacking players from hundreds of yards away.
         uint32 random = rand() % 4;
-        if(random<4){
+        if (random<4){
             m_creature->GetMotionMaster()->MovePoint(0, MovementLocations[random][0], MovementLocations[random][1], MovementLocations[random][2]);} */
     }
 
     void SummonAdds(uint32 Phase)
     {
-        if(Phase == 2)
+        if (Phase == 2)
         {
             uint32 max = rand()%10;
             for(uint32 i = 0; i < 4; ++i)
             {
                 uint32 random = rand()%3;
                 Creature* Add = m_creature->SummonCreature(CREATURE_ADDS, SpawnLocations[random][0], SpawnLocations[random][1], SpawnLocations[random][2], 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
-                if(Add)
+                if (Add)
                     Add->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
             }
         }
 
-        if(Phase == 3)
+        if (Phase == 3)
         {
             uint32 max = rand() % 10 +1;
-            if(max < 1)
+            if (max < 1)
             {
                 for(uint32 i = 0; i < max; ++i)
                 {
                     uint32 random = rand()%4;
                     Creature* Add = m_creature->SummonCreature(CREATURE_ADDS, SpawnLocations[random][0], SpawnLocations[random][1], SpawnLocations[random][2], 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
-                    if(Add)
+                    if (Add)
                         Add->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
                 }
             }
diff --git a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_xt002.cpp b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_xt002.cpp
index 3b0081861d7..6003ef01721 100644
--- a/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_xt002.cpp
+++ b/src/bindings/scripts/scripts/zone/ulduar/ulduar/boss_xt002.cpp
@@ -55,17 +55,17 @@ struct TRINITY_DLL_DECL boss_xt002_AI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if( SEARING_LIGHT_Timer < diff )
+        if (SEARING_LIGHT_Timer < diff)
         {
             DoCast(m_creature,SPELL_SEARING_LIGHT);
             DoScriptText(SAY_SLAY, m_creature);
             SEARING_LIGHT_Timer = 50000;
         } else SEARING_LIGHT_Timer -= diff;
 
-        if( SONIC_BOOM_Timer < diff )
+        if (SONIC_BOOM_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_SONIC_BOOM);
             SONIC_BOOM_Timer = 20000;
diff --git a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp
index b97a0c88227..1ad4fd65f8f 100644
--- a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp
+++ b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp
@@ -82,9 +82,9 @@ struct TRINITY_DLL_DECL npc_lady_sylvanas_windrunnerAI : public ScriptedAI
 
     void JustSummoned(Creature *summoned)
     {
-        if( summoned->GetEntry() == ENTRY_HIGHBORNE_BUNNY )
+        if (summoned->GetEntry() == ENTRY_HIGHBORNE_BUNNY)
         {
-            if( Unit* target = Unit::GetUnit(*summoned,targetGUID) )
+            if (Unit* target = Unit::GetUnit(*summoned,targetGUID))
             {
                 target->SendMonsterMove(target->GetPositionX(), target->GetPositionY(), myZ+15.0,0);
                 target->GetMap()->CreatureRelocation(m_creature, target->GetPositionX(), target->GetPositionY(), myZ+15.0, 0.0f);
@@ -98,9 +98,9 @@ struct TRINITY_DLL_DECL npc_lady_sylvanas_windrunnerAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if( LamentEvent )
+        if (LamentEvent)
         {
-            if( LamentEvent_Timer < diff )
+            if (LamentEvent_Timer < diff)
             {
                 float raX = myX;
                 float raY = myY;
@@ -110,7 +110,7 @@ struct TRINITY_DLL_DECL npc_lady_sylvanas_windrunnerAI : public ScriptedAI
                 m_creature->SummonCreature(ENTRY_HIGHBORNE_BUNNY, raX, raY, myZ, 0, TEMPSUMMON_TIMED_DESPAWN, 3000);
 
                 LamentEvent_Timer = 2000;
-                if( !m_creature->HasAura(SPELL_SYLVANAS_CAST))
+                if (!m_creature->HasAura(SPELL_SYLVANAS_CAST))
                 {
                     DoScriptText(SAY_LAMENT_END, m_creature);
                     DoScriptText(EMOTE_LAMENT_END, m_creature);
@@ -130,15 +130,15 @@ CreatureAI* GetAI_npc_lady_sylvanas_windrunner(Creature *_Creature)
     return new npc_lady_sylvanas_windrunnerAI (_Creature);
 }
 
-bool ChooseReward_npc_lady_sylvanas_windrunner(Player *player, Creature *_Creature, const Quest *_Quest, uint32 slot)
+bool ChooseReward_npc_lady_sylvanas_windrunner(Player* pPlayer, Creature *_Creature, const Quest *_Quest, uint32 slot)
 {
-    if( _Quest->GetQuestId() == 9180 )
+    if (_Quest->GetQuestId() == 9180)
     {
         CAST_AI(npc_lady_sylvanas_windrunnerAI, _Creature->AI())->LamentEvent = true;
         CAST_AI(npc_lady_sylvanas_windrunnerAI, _Creature->AI())->DoPlaySoundToSet(_Creature,SOUND_CREDIT);
         _Creature->CastSpell(_Creature,SPELL_SYLVANAS_CAST,false);
 
-        for( uint8 i = 0; i < 4; ++i)
+        for(uint8 i = 0; i < 4; ++i)
             _Creature->SummonCreature(ENTRY_HIGHBORNE_LAMENTER, HighborneLoc[i][0], HighborneLoc[i][1], HIGHBORNE_LOC_Y, HighborneLoc[i][2], TEMPSUMMON_TIMED_DESPAWN, 160000);
     }
 
@@ -170,9 +170,9 @@ struct TRINITY_DLL_DECL npc_highborne_lamenterAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if( EventMove )
+        if (EventMove)
         {
-            if( EventMove_Timer < diff )
+            if (EventMove_Timer < diff)
             {
                 m_creature->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
                 m_creature->SendMonsterMoveWithSpeed(m_creature->GetPositionX(),m_creature->GetPositionY(),HIGHBORNE_LOC_Y_NEW,5000);
@@ -180,9 +180,9 @@ struct TRINITY_DLL_DECL npc_highborne_lamenterAI : public ScriptedAI
                 EventMove = false;
             }else EventMove_Timer -= diff;
         }
-        if( EventCast )
+        if (EventCast)
         {
-            if( EventCast_Timer < diff )
+            if (EventCast_Timer < diff)
             {
                 DoCast(m_creature,SPELL_HIGHBORNE_AURA);
                 EventCast = false;
@@ -205,35 +205,35 @@ CreatureAI* GetAI_npc_highborne_lamenter(Creature *_Creature)
 #define GOSSIP_HPF2 "Kel'Thuzad"
 #define GOSSIP_HPF3 "Ner'zhul"
 
-bool GossipHello_npc_parqual_fintallas(Player *player, Creature *_Creature)
+bool GossipHello_npc_parqual_fintallas(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(6628) == QUEST_STATUS_INCOMPLETE && !player->HasAura(SPELL_MARK_OF_SHAME) )
+    if (pPlayer->GetQuestStatus(6628) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasAura(SPELL_MARK_OF_SHAME))
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-        player->SEND_GOSSIP_MENU(5822, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HPF3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+        pPlayer->SEND_GOSSIP_MENU(5822, _Creature->GetGUID());
     }
     else
-        player->SEND_GOSSIP_MENU(5821, _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(5821, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_parqual_fintallas(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_parqual_fintallas(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->CLOSE_GOSSIP_MENU();
-        _Creature->CastSpell(player,SPELL_MARK_OF_SHAME,false);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        _Creature->CastSpell(pPlayer,SPELL_MARK_OF_SHAME,false);
     }
     if (action == GOSSIP_ACTION_INFO_DEF+2)
     {
-        player->CLOSE_GOSSIP_MENU();
-        player->AreaExploredOrEventHappens(6628);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->AreaExploredOrEventHappens(6628);
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp
index 751bea7b168..af9f2bdebf9 100644
--- a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp
+++ b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp
@@ -51,9 +51,9 @@ struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!player)
+        if (!pPlayer)
             return;
 
         switch (i)
@@ -61,23 +61,23 @@ struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI
 
          case 19:
             m_creature->SummonCreature(ENTRY_STOMPER, -6391.69, -1730.49, -272.83, 4.96, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
-            DoScriptText(SAY_AGGRO1, m_creature, player);
+            DoScriptText(SAY_AGGRO1, m_creature, pPlayer);
             break;
             case 28:
-            DoScriptText(SAY_SEARCH, m_creature, player);
+            DoScriptText(SAY_SEARCH, m_creature, pPlayer);
             break;
             case 38:
             m_creature->SummonCreature(ENTRY_TARLORD, -6370.75, -1382.84, -270.51, 6.06, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
-            DoScriptText(SAY_AGGRO2, m_creature, player);
+            DoScriptText(SAY_AGGRO2, m_creature, pPlayer);
             break;
             case 49:
             m_creature->SummonCreature(ENTRY_TARLORD1, -6324.44, -1181.05, -270.17, 4.34, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
-            DoScriptText(SAY_AGGRO3, m_creature, player);
+            DoScriptText(SAY_AGGRO3, m_creature, pPlayer);
             break;
          case 55:
-            DoScriptText(SAY_FINISH, m_creature, player);
-            if (player && player->GetTypeId() == TYPEID_PLAYER)
-                CAST_PLR(player)->GroupEventHappens(QUEST_CHASING_AME,m_creature);
+            DoScriptText(SAY_FINISH, m_creature, pPlayer);
+            if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)
+                CAST_PLR(pPlayer)->GroupEventHappens(QUEST_CHASING_AME,m_creature);
             break;
 
         }
@@ -100,8 +100,8 @@ struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI
     {
         if (PlayerGUID)
         {
-            if (Player* player = Unit::GetPlayer(PlayerGUID))
-                CAST_PLR(player)->FailQuest(QUEST_CHASING_AME);
+            if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
+                CAST_PLR(pPlayer)->FailQuest(QUEST_CHASING_AME);
         }
     }
 
@@ -120,12 +120,12 @@ struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI
     }
 };
 
-bool QuestAccept_npc_ame(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_ame(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_CHASING_AME)
     {
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, player->GetGUID());
-        DoScriptText(SAY_READY, creature, player);
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, pPlayer->GetGUID());
+        DoScriptText(SAY_READY, creature, pPlayer);
         creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0);
         // Change faction so mobs attack
         creature->setFaction(113);
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
index df9a01046a4..1c540256e50 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
@@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI
 
     void Reset()
     {
-        if(undead) // Visual Hack
+        if (undead) // Visual Hack
             m_creature->SetDisplayId(MODEL_INGVAR_HUMAN);
 
         undead = false;
@@ -109,13 +109,13 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI
 
         wait_Timer = 0;
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_INGVAR_EVENT, NOT_STARTED);
     }
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if( damage >= m_creature->GetHealth() && !undead)
+        if (damage >= m_creature->GetHealth() && !undead)
         {
             //DoCast(m_creature,SPELL_INGVAR_FEIGN_DEATH,true);  // Dont work ???
             // visuel hack
@@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI
             DoScriptText(YELL_DEAD_1,m_creature);
         }
 
-        if(event_inProgress)
+        if (event_inProgress)
         {
             damage = 0;
         }
@@ -155,7 +155,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI
     {
         DoScriptText(YELL_AGGRO_1,m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS);
     }
 
@@ -163,13 +163,13 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI
     {
         DoScriptText(YELL_DEAD_2,m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_INGVAR_EVENT, DONE);
     }
 
     void KilledUnit(Unit *victim)
     {
-        if(undead) { DoScriptText(YELL_KILL_1,m_creature); }
+        if (undead) { DoScriptText(YELL_KILL_1,m_creature); }
         else { DoScriptText(YELL_KILL_2,m_creature); }
     }
 
@@ -178,10 +178,10 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(event_inProgress)
+        if (event_inProgress)
         {
-            if(SpawnResTimer)
-                if(SpawnResTimer< diff)
+            if (SpawnResTimer)
+                if (SpawnResTimer< diff)
                 {
                     DoCast(m_creature,SPELL_SUMMON_BANSHEE); // Summons direktly on caster position
                     //DoCast(m_creature,SPELL_SCOURG_RESURRECTION_EFFEKTSPAWN); // Dont needet ?
@@ -192,17 +192,17 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI
         }
 
         // This is used for a spell queue ... the spells should not castet if one spell is already casting
-        if(wait_Timer)
-            if(wait_Timer < diff)
+        if (wait_Timer)
+            if (wait_Timer < diff)
             {
                 wait_Timer = 0;
             }else wait_Timer -= diff;
 
-        if(Cleave_Timer < diff)
+        if (Cleave_Timer < diff)
         {
-            if(!wait_Timer)
+            if (!wait_Timer)
             {
-                if(undead)
+                if (undead)
                     DoCast(m_creature->getVictim(),HeroicMode ? H_SPELL_WOE_STRIKE : SPELL_WOE_STRIKE);
                 else
                     DoCast(m_creature->getVictim(),SPELL_CLEAVE);
@@ -212,11 +212,11 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI
             }
         }else Cleave_Timer -= diff;
 
-        if(Smash_Timer < diff)
+        if (Smash_Timer < diff)
         {
-            if(!wait_Timer)
+            if (!wait_Timer)
             {
-                if(undead)
+                if (undead)
                     DoCast(m_creature->getVictim(), SPELL_DARK_SMASH);
                 else
                     DoCast(m_creature->getVictim(),HeroicMode ? H_SPELL_SMASH : SPELL_SMASH);
@@ -226,22 +226,22 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI
             }
         }else Smash_Timer -= diff;
 
-        if(!undead)
+        if (!undead)
         {
-            if(Enrage_Timer < diff)
+            if (Enrage_Timer < diff)
             {
                 DoCast(m_creature,HeroicMode ? H_SPELL_ENRAGE : SPELL_ENRAGE);
                 Enrage_Timer = 10000;
             }else Enrage_Timer -= diff;
         }else // In Undead form used to summon weapon
         {
-            if(Enrage_Timer < diff)
+            if (Enrage_Timer < diff)
             {
-                if(!wait_Timer)
+                if (!wait_Timer)
                 {
                     // Spawn target for Axe
                     Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO, 1);
-                    if(target)
+                    if (target)
                     {
                         Creature* temp = m_creature->SummonCreature(ENTRY_THROW_TARGET,target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,2000);
 
@@ -253,11 +253,11 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI
         }
 
 
-        if(Roar_Timer < diff)
+        if (Roar_Timer < diff)
         {
-            if(!wait_Timer)
+            if (!wait_Timer)
             {
-                if(undead)
+                if (undead)
                     DoCast(m_creature,HeroicMode ? H_SPELL_DREADFUL_ROAR : SPELL_DREADFUL_ROAR);
                 else
                     DoCast(m_creature,HeroicMode ? H_SPELL_STAGGERING_ROAR : SPELL_STAGGERING_ROAR);
@@ -312,7 +312,7 @@ struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI
         DoTeleportTo(x+1,y,z+30);
 
         Unit* ingvar = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_INGVAR));
-        if(ingvar)
+        if (ingvar)
         {
             m_creature->GetMotionMaster()->MovePoint(1,x,y,z+15);
 
@@ -322,10 +322,10 @@ struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI
 
     void MovementInform(uint32 type, uint32 id)
     {
-        if(type != POINT_MOTION_TYPE)
+        if (type != POINT_MOTION_TYPE)
             return;
         Unit* ingvar = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_INGVAR));
-        if(ingvar)
+        if (ingvar)
         {
             switch (id)
             {
@@ -349,13 +349,13 @@ struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI
     void EnterCombat(Unit *who) {}
     void UpdateAI(const uint32 diff)
     {
-        if(Resurect_Timer)
-            if(Resurect_Timer < diff)
+        if (Resurect_Timer)
+            if (Resurect_Timer < diff)
             {
-                if(Resurect_Phase == 1)
+                if (Resurect_Phase == 1)
                 {
                     Unit* ingvar = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_INGVAR));
-                    if(ingvar)
+                    if (ingvar)
                     {
                         ingvar->SetStandState(UNIT_STAND_STATE_STAND);
                         ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_HEAL,false);
@@ -365,7 +365,7 @@ struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI
                 }else if (Resurect_Phase == 2)
                 {
                     Creature* ingvar = Unit::GetCreature((*m_creature), pInstance->GetData64(DATA_INGVAR));
-                    if(ingvar)
+                    if (ingvar)
                     {
                         ingvar->RemoveAurasDueToSpell(SPELL_SCOURG_RESURRECTION_DUMMY);
                         //ingvar->CastSpell(ingvar,SPELL_INGVAR_TRANSFORM,false);
@@ -410,7 +410,7 @@ struct TRINITY_DLL_DECL mob_ingvar_throw_dummyAI : public ScriptedAI
     void Reset()
     {
         Unit* target = m_creature->FindNearestCreature(ENTRY_THROW_TARGET,50);
-        if(target)
+        if (target)
         {
             DoCast(m_creature, HeroicMode ? H_SPELL_SHADOW_AXE_DAMAGE : SPELL_SHADOW_AXE_DAMAGE);
             float x,y,z;
@@ -424,7 +424,7 @@ struct TRINITY_DLL_DECL mob_ingvar_throw_dummyAI : public ScriptedAI
     void EnterCombat(Unit *who) {}
     void UpdateAI(const uint32 diff)
     {
-        if(Despawn_Timer < diff)
+        if (Despawn_Timer < diff)
         {
             m_creature->DealDamage(m_creature,m_creature->GetHealth());
             m_creature->RemoveCorpse();
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp
index ea3b829ef6a..878cc8c17b0 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp
@@ -82,13 +82,13 @@ struct TRINITY_DLL_DECL mob_frost_tombAI : public ScriptedAI
 
     void JustDied(Unit *killer)
     {
-        if(killer->GetGUID() != m_creature->GetGUID())
+        if (killer->GetGUID() != m_creature->GetGUID())
             ShatterFrostTomb = true;
 
-        if(FrostTombGUID)
+        if (FrostTombGUID)
         {
             Unit* FrostTomb = Unit::GetUnit((*m_creature),FrostTombGUID);
-            if(FrostTomb)
+            if (FrostTomb)
                 FrostTomb->RemoveAurasDueToSpell(SPELL_FROST_TOMB);
         }
     }
@@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL mob_frost_tombAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         Unit* temp = Unit::GetUnit((*m_creature),FrostTombGUID);
-        if((temp && temp->isAlive() && !temp->HasAura(SPELL_FROST_TOMB)) || !temp )
+        if ((temp && temp->isAlive() && !temp->HasAura(SPELL_FROST_TOMB)) || !temp)
             m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
     }
 };
@@ -129,13 +129,13 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI
 
         ResetTimer();
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_PRINCEKELESETH_EVENT, NOT_STARTED);
     }
 
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
 
         DoScriptText(SAY_KILL, m_creature);
@@ -145,22 +145,22 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI
     {
         DoScriptText(SAY_DEATH, m_creature);
 
-        if(Heroic && !ShatterFrostTomb)
+        if (Heroic && !ShatterFrostTomb)
         {
             AchievementEntry const *AchievOnTheRocks = GetAchievementStore()->LookupEntry(ACHIEVEMENT_ON_THE_ROCKS);
-            if(AchievOnTheRocks)
+            if (AchievOnTheRocks)
             {
-                Map *map = m_creature->GetMap();
-                if(map && map->IsDungeon())
+                Map* pMap = m_creature->GetMap();
+                if (pMap && pMap->IsDungeon())
                 {
-                    Map::PlayerList const &players = map->GetPlayers();
+                    Map::PlayerList const &players = pMap->GetPlayers();
                     for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievOnTheRocks);
                 }
             }
         }
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_PRINCEKELESETH_EVENT, DONE);
     }
 
@@ -169,7 +169,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI
         DoScriptText(SAY_AGGRO, m_creature);
         DoZoneInCombat();
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_PRINCEKELESETH_EVENT, IN_PROGRESS);
     }
 
@@ -184,23 +184,23 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(ShadowboltTimer < diff)
+        if (ShadowboltTimer < diff)
         {
             Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO, 0);
-            if(target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER)
+            if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER)
                 m_creature->CastSpell(target, Heroic ? SPELL_SHADOWBOLT_HEROIC : SPELL_SHADOWBOLT, true);
             ShadowboltTimer = 10000;
         }else ShadowboltTimer -= diff;
 
-        if(!Skeletons)
-            if((SummonSkeletonsTimer < diff))
+        if (!Skeletons)
+            if ((SummonSkeletonsTimer < diff))
             {
                 Creature* Skeleton;
                 DoScriptText(SAY_SKELETONS, m_creature);
                 for(uint8 i = 0; i < 5; ++i)
                 {
                     Skeleton = m_creature->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1] , SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000);
-                    if(Skeleton)
+                    if (Skeleton)
                     {
                         Skeleton->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
                         Skeleton->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX(), m_creature->GetPositionY() , m_creature->GetPositionZ());
@@ -211,14 +211,14 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI
                 Skeletons = true;
             }else SummonSkeletonsTimer -= diff;
 
-        if(FrostTombTimer < diff)
+        if (FrostTombTimer < diff)
         {
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-            if(target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER)
+            if (target && target->isAlive() && target->GetTypeId() == TYPEID_PLAYER)
             {
                 //DoCast(target, SPELL_FROST_TOMB_SUMMON, true);
                 Creature* Chains = m_creature->SummonCreature(CREATURE_FROSTTOMB, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000);
-                if(Chains)
+                if (Chains)
                 {
                     CAST_AI(mob_frost_tombAI, Chains->AI())->SetPrisoner(target);
                     Chains->CastSpell(target, SPELL_FROST_TOMB, true);
@@ -257,10 +257,10 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI
     void EnterCombat(Unit *who){}
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(done_by->GetGUID() == m_creature->GetGUID())
+        if (done_by->GetGUID() == m_creature->GetGUID())
             return;
 
-        if(damage >= m_creature->GetHealth())
+        if (damage >= m_creature->GetHealth())
         {
             PretendToDie();
             damage = 0;
@@ -286,7 +286,7 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI
         m_creature->SetStandState(UNIT_STAND_STATE_STAND);
         m_creature->CastSpell(m_creature,SPELL_SCOURGE_RESSURRECTION,true);
 
-        if(m_creature->getVictim())
+        if (m_creature->getVictim())
         {
             m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
             m_creature->AI()->AttackStart(m_creature->getVictim());
@@ -297,11 +297,11 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(pInstance->GetData(DATA_PRINCEKELESETH_EVENT) == IN_PROGRESS)
+        if (pInstance->GetData(DATA_PRINCEKELESETH_EVENT) == IN_PROGRESS)
         {
-            if(isDead)
+            if (isDead)
             {
-                if(Respawn_Time < diff)
+                if (Respawn_Time < diff)
                 {
                     Resurrect();
                     Respawn_Time = 12000;
@@ -309,10 +309,10 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI
             }
             else
             {
-                if(!UpdateVictim())
+                if (!UpdateVictim())
                     return;
 
-                if(Decrepify_Timer < diff)
+                if (Decrepify_Timer < diff)
                 {
                     DoCast(m_creature->getVictim(),SPELL_DECREPIFY);
                     Decrepify_Timer = 30000;
@@ -322,7 +322,7 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI
             }
         }else
         {
-            if(m_creature->isAlive())
+            if (m_creature->isAlive())
                 m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
         }
 
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
index 8bbb871a0b2..d01a86fb2b9 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
@@ -82,44 +82,44 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI
         Check_Timer = 5000;
 
         ghost = (m_creature->GetEntry() == MOB_SKARVALD_GHOST);
-        if(!ghost)
+        if (!ghost)
         {
             Unit* dalronn = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_DALRONN));
-            if(dalronn && dalronn->isDead())
+            if (dalronn && dalronn->isDead())
                 CAST_CRE(dalronn)->Respawn();
 
-            if(pInstance)
+            if (pInstance)
                 pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED);
         }
     }
 
     void EnterCombat(Unit *who)
     {
-        if(!ghost)
+        if (!ghost)
         {
             DoScriptText(YELL_SKARVALD_AGGRO,m_creature);
 
             Unit* dalronn = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_DALRONN));
-            if(dalronn && dalronn->isAlive() && !dalronn->getVictim())
+            if (dalronn && dalronn->isAlive() && !dalronn->getVictim())
                 dalronn->getThreatManager().addThreat(who,0.0f);
 
-            if(pInstance)
+            if (pInstance)
                 pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS);
         }
     }
 
     void JustDied(Unit* Killer)
     {
-        if(!ghost)
+        if (!ghost)
         {
             Unit* dalronn = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_DALRONN));
-            if(dalronn)
+            if (dalronn)
             {
-                if(dalronn->isDead())
+                if (dalronn->isDead())
                 {
                     DoScriptText(YELL_SKARVALD_DAL_DIED,m_creature);
 
-                    if(pInstance)
+                    if (pInstance)
                         pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE);
                 }
                 else
@@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI
                     m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
                     //DoCast(m_creature,SPELL_SUMMON_SKARVALD_GHOST,true);
                     Creature* temp = m_creature->SummonCreature(MOB_SKARVALD_GHOST,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000);
-                    if(temp)
+                    if (temp)
                         temp->AI()->AttackStart(Killer);
                 }
             }
@@ -138,7 +138,7 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI
 
     void KilledUnit(Unit *victim)
     {
-        if(!ghost)
+        if (!ghost)
         {
             DoScriptText(YELL_SKARVALD_KILL,m_creature);
         }
@@ -146,25 +146,25 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(ghost)
+        if (ghost)
         {
-            if(pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS)
+            if (pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS)
             {
                 m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
             }
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(!ghost)
+        if (!ghost)
         {
-            if(Check_Timer)
-                if(Check_Timer < diff)
+            if (Check_Timer)
+                if (Check_Timer < diff)
                 {
                     Check_Timer = 5000;
                     Unit* dalronn = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_DALRONN));
-                    if(dalronn && dalronn->isDead())
+                    if (dalronn && dalronn->isDead())
                     {
                         Dalronn_isDead = true;
                         Response_Timer = 2000;
@@ -172,9 +172,9 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI
                     }
                 }else Check_Timer -= diff;
 
-            if(Response_Timer)
-                if(Dalronn_isDead)
-                    if(Response_Timer < diff)
+            if (Response_Timer)
+                if (Dalronn_isDead)
+                    if (Response_Timer < diff)
                     {
                         DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST,m_creature);
 
@@ -182,13 +182,13 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI
                     }else Response_Timer -= diff;
         }
 
-        if(Charge_Timer < diff)
+        if (Charge_Timer < diff)
         {
             DoCast(SelectUnit(SELECT_TARGET_RANDOM, 1), SPELL_CHARGE);
             Charge_Timer = 5000+rand()%5000;
         }else Charge_Timer -= diff;
 
-        if(StoneStrike_Timer < diff)
+        if (StoneStrike_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_STONE_STRIKE);
             StoneStrike_Timer = 5000+rand()%5000;
@@ -235,43 +235,43 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI
         AggroYell_Timer = 0;
 
         ghost = m_creature->GetEntry() == MOB_DALRONN_GHOST;
-        if(!ghost)
+        if (!ghost)
         {
             Unit* skarvald = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_SKARVALD));
-            if(skarvald && skarvald->isDead())
+            if (skarvald && skarvald->isDead())
                 CAST_CRE(skarvald)->Respawn();
 
-            if(pInstance)
+            if (pInstance)
                 pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, NOT_STARTED);
         }
     }
 
     void EnterCombat(Unit *who)
     {
-        if(!ghost)
+        if (!ghost)
         {
             Unit* skarvald = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_SKARVALD));
-            if(skarvald && skarvald->isAlive() && !skarvald->getVictim())
+            if (skarvald && skarvald->isAlive() && !skarvald->getVictim())
                 skarvald->getThreatManager().addThreat(who,0.0f);
 
             AggroYell_Timer = 5000;
 
-            if(pInstance)
+            if (pInstance)
                 pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS);
         }
     }
 
     void JustDied(Unit* Killer)
     {
-        if(!ghost)
+        if (!ghost)
         {
             Unit* skarvald = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_SKARVALD));
-            if(skarvald)
-                if(skarvald->isDead())
+            if (skarvald)
+                if (skarvald->isDead())
                 {
                     DoScriptText(YELL_DALRONN_SKA_DIED,m_creature);
 
-                    if(pInstance)
+                    if (pInstance)
                         pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE);
                 }
                 else
@@ -281,7 +281,7 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI
                     m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
                     //DoCast(m_creature,SPELL_SUMMON_DALRONN_GHOST,true);
                     Creature* temp = m_creature->SummonCreature(MOB_DALRONN_GHOST,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000);
-                    if(temp)
+                    if (temp)
                         temp->AI()->AttackStart(Killer);
                 }
         }
@@ -289,7 +289,7 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI
 
     void KilledUnit(Unit *victim)
     {
-        if(!ghost)
+        if (!ghost)
         {
             DoScriptText(YELL_DALRONN_KILL,m_creature);
         }
@@ -297,33 +297,33 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(ghost)
+        if (ghost)
         {
-            if(pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS)
+            if (pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS)
             {
                 m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
             }
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(AggroYell_Timer)
-            if(AggroYell_Timer < diff)
+        if (AggroYell_Timer)
+            if (AggroYell_Timer < diff)
             {
                 DoScriptText(YELL_DALRONN_AGGRO,m_creature);
 
                 AggroYell_Timer = 0;
             }else AggroYell_Timer -= diff;
 
-        if(!ghost)
+        if (!ghost)
         {
-            if(Check_Timer)
-                if(Check_Timer < diff)
+            if (Check_Timer)
+                if (Check_Timer < diff)
                 {
                     Check_Timer = 5000;
                     Unit* skarvald = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_SKARVALD));
-                    if(skarvald && skarvald->isDead())
+                    if (skarvald && skarvald->isDead())
                     {
                         Skarvald_isDead = true;
                         Response_Timer = 2000;
@@ -331,9 +331,9 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI
                     }
                 }else Check_Timer -= diff;
 
-            if(Response_Timer)
-                if(Skarvald_isDead)
-                    if(Response_Timer < diff)
+            if (Response_Timer)
+                if (Skarvald_isDead)
+                    if (Response_Timer < diff)
                     {
                         DoScriptText(YELL_DALRONN_SKA_DIEDFIRST,m_creature);
 
@@ -341,7 +341,7 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI
                     }else Response_Timer -= diff;
         }
 
-        if(ShadowBolt_Timer < diff)
+        if (ShadowBolt_Timer < diff)
         {
             if (!m_creature->IsNonMeleeSpellCasted(false))
             {
@@ -350,7 +350,7 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI
             }
         }else ShadowBolt_Timer -= diff;
 
-        if(Debilitate_Timer < diff)
+        if (Debilitate_Timer < diff)
         {
             if (!m_creature->IsNonMeleeSpellCasted(false))
              {
@@ -359,8 +359,8 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI
             }
         }else Debilitate_Timer -= diff;
 
-        if(HeroicMode)
-            if(Summon_Timer < diff)
+        if (HeroicMode)
+            if (Summon_Timer < diff)
             {
                 DoCast(m_creature,H_SPELL_SUMMON_SKELETONS);
                 Summon_Timer = (rand()%10000) + 20000;
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
index afbacc6c22e..3c742c74016 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
@@ -48,7 +48,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
 {
-    instance_utgarde_keep(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_utgarde_keep(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint64 Keleseth;
     uint64 Skarvald;
@@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS) return true;
+            if (Encounters[i] == IN_PROGRESS) return true;
 
         return false;
     }
@@ -151,28 +151,28 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
         switch(type)
         {
         case DATA_PRINCEKELESETH_EVENT:
-            if(data == DONE)
+            if (data == DONE)
             {
                 //HandleGameObject(doorname, 0);
             }
             Encounters[0] = data;
             break;
         case DATA_SKARVALD_DALRONN_EVENT:
-            if(data == DONE)
+            if (data == DONE)
             {
                 //HandleGameObject(doorname, 0);
             }
             Encounters[1] = data;
             break;
         case DATA_INGVAR_EVENT:
-            if(data == DONE)
+            if (data == DONE)
             {
                 //HandleGameObject(doorname, 0);
             }
             Encounters[2] = data;
             break;
         case EVENT_FORGE_1:
-            if(data == NOT_STARTED)
+            if (data == NOT_STARTED)
             {
                 HandleGameObject(forge_bellow[0],false);
                 HandleGameObject(forge_fire[0],false);
@@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
             }
             break;
         case EVENT_FORGE_2:
-            if(data == NOT_STARTED)
+            if (data == NOT_STARTED)
             {
                 HandleGameObject(forge_bellow[1],false);
                 HandleGameObject(forge_fire[1],false);
@@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
             }
             break;
         case EVENT_FORGE_3:
-            if(data == NOT_STARTED)
+            if (data == NOT_STARTED)
             {
                 HandleGameObject(forge_bellow[2],false);
                 HandleGameObject(forge_fire[2],false);
@@ -261,7 +261,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
         std::istringstream loadStream(in);
         loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2;
 
-        if( dataHead1 == 'U' && dataHead2 == 'K')
+        if (dataHead1 == 'U' && dataHead2 == 'K')
         {
             Encounters[0] = data0;
             Encounters[1] = data1;
@@ -277,9 +277,9 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_utgarde_keep(Map* map)
+InstanceData* GetInstanceData_instance_utgarde_keep(Map* pMap)
 {
-   return new instance_utgarde_keep(map);
+   return new instance_utgarde_keep(pMap);
 }
 
 void AddSC_instance_utgarde_keep()
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/utgarde_keep.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/utgarde_keep.cpp
index 54e7b707fb8..4c293261242 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/utgarde_keep.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/utgarde_keep.cpp
@@ -39,13 +39,13 @@ struct TRINITY_DLL_DECL npc_dragonflayer_forge_masterAI : public ScriptedAI
 
     void Reset()
     {
-        if(fm_Type == 0) fm_Type = GetForgeMasterType();
+        if (fm_Type == 0) fm_Type = GetForgeMasterType();
         CheckForge();
     }
 
     void CheckForge()
     {
-       if(pInstance)
+       if (pInstance)
         {
             switch(fm_Type)
             {
@@ -64,8 +64,8 @@ struct TRINITY_DLL_DECL npc_dragonflayer_forge_masterAI : public ScriptedAI
 
     void JustDied(Unit *killer)
     {
-        if(fm_Type == 0) fm_Type = GetForgeMasterType();
-        if(pInstance)
+        if (fm_Type == 0) fm_Type = GetForgeMasterType();
+        if (pInstance)
         {
             switch(fm_Type)
             {
@@ -84,8 +84,8 @@ struct TRINITY_DLL_DECL npc_dragonflayer_forge_masterAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(fm_Type == 0) fm_Type = GetForgeMasterType();
-        if(pInstance)
+        if (fm_Type == 0) fm_Type = GetForgeMasterType();
+        if (pInstance)
         {
             switch(fm_Type)
             {
@@ -112,9 +112,9 @@ struct TRINITY_DLL_DECL npc_dragonflayer_forge_masterAI : public ScriptedAI
         {
             GameObject* temp;
             temp = m_creature->FindNearestGameObject(entry_search[i],30);
-            if(temp)
+            if (temp)
             {
-                if(m_creature->IsWithinDist(temp,diff,false))
+                if (m_creature->IsWithinDist(temp,diff,false))
                 {
                     near_f = i + 1;
                     diff = m_creature->GetDistance2d(temp);
@@ -134,10 +134,10 @@ struct TRINITY_DLL_DECL npc_dragonflayer_forge_masterAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(fm_Type == 0)
+        if (fm_Type == 0)
             fm_Type = GetForgeMasterType();
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
index 84ab003a430..ab713d48c49 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp
@@ -36,7 +36,7 @@ struct TRINITY_DLL_DECL boss_palehoofAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
index 8d2af03e9b7..6350898b452 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_skadiAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         phase = 0;
@@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL boss_skadiAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%3)
         {
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
index 6dd0d6c5767..ea0c9971220 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
@@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_svalaAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
@@ -56,7 +56,7 @@ struct TRINITY_DLL_DECL boss_svalaAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%3)
         {
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
index 1793c972349..4dbc441db2b 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
@@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
@@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%4)
         {
diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
index bbf7ded89a2..e1361c8960e 100644
--- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
+++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
@@ -3,12 +3,12 @@
 
 struct TRINITY_DLL_DECL instance_pinnacle : public ScriptedInstance
 {
-    instance_pinnacle(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_pinnacle(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 };
 
-InstanceData* GetInstanceData_instance_pinnacle(Map* map)
+InstanceData* GetInstanceData_instance_pinnacle(Map* pMap)
 {
-    return new instance_pinnacle(map);
+    return new instance_pinnacle(pMap);
 }
 
 void AddSC_instance_pinnacle()
diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp
index 51e6df5e023..afa264afdc3 100644
--- a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp
+++ b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_archavon.cpp
@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_archavonAI : public ScriptedAI
     {
         events.Reset();
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ARCHAVON_EVENT, NOT_STARTED);
     }
 
@@ -69,7 +69,7 @@ struct TRINITY_DLL_DECL boss_archavonAI : public ScriptedAI
         events.ScheduleEvent(EVENT_STOMP, 45000);
         events.ScheduleEvent(EVENT_BERSERK, 300000);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ARCHAVON_EVENT, IN_PROGRESS);
     }
 
@@ -77,12 +77,12 @@ struct TRINITY_DLL_DECL boss_archavonAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         events.Update(diff);
 
-        if(me->hasUnitState(UNIT_STAT_CASTING))
+        if (me->hasUnitState(UNIT_STAT_CASTING))
             return;
 
         while(uint32 eventId = events.ExecuteEvent())
@@ -90,12 +90,12 @@ struct TRINITY_DLL_DECL boss_archavonAI : public ScriptedAI
             switch(eventId)
             {
                 case EVENT_ROCK_SHARDS:
-                    if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                    if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_ROCK_SHARDS);
                     events.ScheduleEvent(EVENT_ROCK_SHARDS, 15000);
                     return;
                 case EVENT_CHOKING_CLOUD:
-                    if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                    if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_CRUSHING_LEAP, true); //10y~80y, ignore range
                     events.ScheduleEvent(EVENT_CHOKING_CLOUD, 30000);
                     return;
@@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL mob_warderAI : public ScriptedAI //npc 32353
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         events.Update(diff);
@@ -154,7 +154,7 @@ struct TRINITY_DLL_DECL mob_warderAI : public ScriptedAI //npc 32353
             {
                 case EVENT_ROCK_SHOWER:
                 {
-                    if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                    if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_ROCK_SHOWER);
                     events.ScheduleEvent(EVENT_ROCK_SHARDS, 6000);
                     return;
diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp
index 3c86619cef8..8055abcb2c0 100644
--- a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp
+++ b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp
@@ -54,17 +54,17 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
         DespawnAllMinions();
         SummonAllMinions();
 
-        if(pInstance)
+        if (pInstance)
            pInstance->SetData(DATA_EMALON_EVENT, NOT_STARTED);
     }
 
     void DespawnAllMinions()
     {
-        if(!MinionList.empty())
+        if (!MinionList.empty())
         {
             for(std::list<uint64>::const_iterator itr = MinionList.begin(); itr != MinionList.end(); itr++)
             {
-                if(Creature *Minion = Unit::GetCreature(*m_creature, (*itr)))
+                if (Creature *Minion = Unit::GetCreature(*m_creature, (*itr)))
                    Minion->DisappearAndDie();
             }
         }
@@ -75,13 +75,13 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
     void JustSummoned(Creature *Summoned)
     {
         MinionList.push_back(Summoned->GetGUID());
-        if(Unit* target = m_creature->getVictim())
+        if (Unit* target = m_creature->getVictim())
            Summoned->AI()->AttackStart(target);
     }
 
     void SummonAllMinions()
     {
-        if(MinionList.empty())
+        if (MinionList.empty())
            for(uint8 i = 0; i < 4; ++i)
                SummonMinion(m_creature, MinionLocation[i].x, MinionLocation[i].y, MinionLocation[i].z, MinionLocation[i].o);
     }
@@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(!MinionList.empty())
+        if (!MinionList.empty())
         {
             for(std::list<uint64>::const_iterator itr = MinionList.begin(); itr != MinionList.end(); ++itr)
             {
@@ -118,19 +118,19 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
         events.ScheduleEvent(EVENT_BERSERK, 360000);
         events.ScheduleEvent(EVENT_SHOCK, 20000);
 
-        if(pInstance)
+        if (pInstance)
            pInstance->SetData(DATA_EMALON_EVENT, IN_PROGRESS);
     }
 
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         events.Update(diff);
 
-        if(me->hasUnitState(UNIT_STAT_CASTING))
+        if (me->hasUnitState(UNIT_STAT_CASTING))
            return;
 
         while(uint32 eventId = events.ExecuteEvent())
@@ -138,7 +138,7 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
             switch(eventId)
             {
                 case EVENT_CHAIN_LIGHTNING:
-                    if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                    if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                        DoCast(target, SPELL_CHAIN_LIGHTNING);
                     events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 20000);
                     return;
@@ -146,7 +146,7 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
                     for(std::list<uint64>::const_iterator itr = MinionList.begin(); itr != MinionList.end(); ++itr)
                     {
                         Creature* Minion = (Unit::GetCreature(*m_creature, *itr));            
-                        if(Minion && Minion->isAlive() && !Minion->HasAura(SPELL_OVERCHARGED))
+                        if (Minion && Minion->isAlive() && !Minion->HasAura(SPELL_OVERCHARGED))
                         {
                             Minion->CastSpell(me, SPELL_OVERCHARGED, true);
                             Minion->SetHealth(Minion->GetMaxHealth());
@@ -163,9 +163,9 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
                     for(std::list<uint64>::const_iterator itr = MinionList.begin(); itr != MinionList.end(); ++itr)
                     {
                         Creature* Minion = (Unit::GetCreature(*m_creature, *itr));            
-                        if(Minion && Minion->isAlive())
+                        if (Minion && Minion->isAlive())
                         {
-                            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                             {
                                 Minion->CastSpell(target, SPELL_SHOCK, true);
                                 events.ScheduleEvent(EVENT_SHOCK, 20000);
@@ -213,14 +213,14 @@ struct TRINITY_DLL_DECL mob_tempest_minionAI : public ScriptedAI
     void EnterCombat(Unit *who)
     {
         DoZoneInCombat();
-        if(Emalon)
+        if (Emalon)
            Emalon->AI()->AttackStart(who);
     }
 
     void JustDied(Unit* Killer)
     {
         m_creature->DisappearAndDie();
-        if(Emalon)
+        if (Emalon)
         {
             boss_emalonAI::SummonMinion(Emalon, Emalon->GetPositionX(), Emalon->GetPositionY(), Emalon->GetPositionZ(), Emalon->GetOrientation());
             DoScriptText(EMOTE_MINION_RESPAWN, m_creature);
@@ -230,12 +230,12 @@ struct TRINITY_DLL_DECL mob_tempest_minionAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
            return;
 
-        if(Aura *OverchargedAura = m_creature->GetAura(SPELL_OVERCHARGED))
+        if (Aura *OverchargedAura = m_creature->GetAura(SPELL_OVERCHARGED))
         {
-            if(OverchargedAura->GetStackAmount() < 10)
+            if (OverchargedAura->GetStackAmount() < 10)
             {
                 if (SPELL_OVERCHARGED_Timer < diff)
                 {
@@ -245,7 +245,7 @@ struct TRINITY_DLL_DECL mob_tempest_minionAI : public ScriptedAI
             }
             else
             {
-                if(OverchargedAura->GetStackAmount() == 10 && (AlreadyOvercharged == false))
+                if (OverchargedAura->GetStackAmount() == 10 && (AlreadyOvercharged == false))
                 {
                     DoCast(me,SPELL_OVERCHARGED_BLAST);
                     AlreadyOvercharged = true;
diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp b/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
index 06b3df060c1..c972defdd4f 100644
--- a/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
+++ b/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
@@ -5,7 +5,7 @@
 
 struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
 {
-    instance_archavon(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_archavon(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     std::string strInstData;
     uint64 Archavon;
@@ -24,7 +24,7 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS)
+            if (Encounters[i] == IN_PROGRESS)
                 return true;
 
         return false;
@@ -109,9 +109,9 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_archavon(Map* map)
+InstanceData* GetInstanceData_instance_archavon(Map* pMap)
 {
-    return new instance_archavon(map);
+    return new instance_archavon(pMap);
 }
 
 void AddSC_instance_archavon()
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp
index d2a0bff840d..2c64b1be892 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp
+++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_cyanigosa.cpp
@@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL boss_cyanigosaAI : public ScriptedAI
     void UpdateAI(const uint32 diff) 
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
         
         DoMeleeAttackIfReady();
@@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_cyanigosaAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%3)
         {
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp
index cc3129143cb..70f50cbdcb1 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp
+++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_erekem.cpp
@@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI
     void UpdateAI(const uint32 diff) 
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
                 
         DoMeleeAttackIfReady();    
@@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%3)
         {
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp
index 745fd7ea8f4..5d355a905ee 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp
+++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_ichoron.cpp
@@ -43,7 +43,7 @@ struct TRINITY_DLL_DECL boss_ichoronAI : public ScriptedAI
     void UpdateAI(const uint32 diff) 
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
                 
         DoMeleeAttackIfReady();    
@@ -54,7 +54,7 @@ struct TRINITY_DLL_DECL boss_ichoronAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%3)
         {
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp
index ac33b86916f..ce1a7dd4e0d 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp
+++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_lavanthor.cpp
@@ -28,7 +28,7 @@ struct TRINITY_DLL_DECL boss_lavanthorAI : public ScriptedAI
     void UpdateAI(const uint32 diff) 
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
                 
         DoMeleeAttackIfReady();    
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp
index ddf9cce882e..178352de109 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp
+++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_moragg.cpp
@@ -26,7 +26,7 @@ struct TRINITY_DLL_DECL boss_moraggAI : public ScriptedAI
     void UpdateAI(const uint32 diff) 
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;    
         
         DoMeleeAttackIfReady();    
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp
index 840ac4bf723..e327b10ed12 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp
+++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_xevozz.cpp
@@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL boss_xevozzAI : public ScriptedAI
     void UpdateAI(const uint32 diff) 
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
                 
         DoMeleeAttackIfReady();    
@@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_xevozzAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%3)
         {
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp b/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp
index e02cb9adf7a..7b31f5b899d 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp
+++ b/src/bindings/scripts/scripts/zone/violet_hold/boss_zuramat.cpp
@@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI
     void UpdateAI(const uint32 diff) 
     {
         //Return since we have no target
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
         
         DoMeleeAttackIfReady();    
@@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI
     }
     void KilledUnit(Unit *victim)
     {
-        if(victim == m_creature)
+        if (victim == m_creature)
             return;
         switch(rand()%3)
         {
diff --git a/src/bindings/scripts/scripts/zone/violet_hold/instance_violet_hold.cpp b/src/bindings/scripts/scripts/zone/violet_hold/instance_violet_hold.cpp
index 09a805602b1..98962b919e0 100644
--- a/src/bindings/scripts/scripts/zone/violet_hold/instance_violet_hold.cpp
+++ b/src/bindings/scripts/scripts/zone/violet_hold/instance_violet_hold.cpp
@@ -3,12 +3,12 @@
 
 struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance
 {
-    instance_violet_hold(Map *Map) : ScriptedInstance(Map) {Initialize();};
+    instance_violet_hold(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 };
 
-InstanceData* GetInstanceData_instance_violet_hold(Map* map)
+InstanceData* GetInstanceData_instance_violet_hold(Map* pMap)
 {
-    return new instance_violet_hold(map);
+    return new instance_violet_hold(pMap);
 }
 
 void AddSC_instance_violet_hold()
diff --git a/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp b/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp
index e403036436e..66e62fb652b 100644
--- a/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp
+++ b/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp
@@ -28,7 +28,7 @@ EndScriptData */
 
 struct TRINITY_DLL_DECL instance_wailing_caverns : public ScriptedInstance
 {
-    instance_wailing_caverns(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_wailing_caverns(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint32 Encounter[ENCOUNTERS];
 
@@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL instance_wailing_caverns : public ScriptedInstance
             case TYPE_MUTANUS_THE_DEVOURER: Encounter[8] = data;break;
             case TYPE_NARALEX_YELLED:       yelled = true;      break;
         }
-        if(data == DONE)SaveToDB();
+        if (data == DONE)SaveToDB();
     }
 
     uint32 GetData(uint32 type)
@@ -128,9 +128,9 @@ struct TRINITY_DLL_DECL instance_wailing_caverns : public ScriptedInstance
 
 };
 
-InstanceData* GetInstanceData_instance_wailing_caverns(Map* map)
+InstanceData* GetInstanceData_instance_wailing_caverns(Map* pMap)
 {
-    return new instance_wailing_caverns(map);
+    return new instance_wailing_caverns(pMap);
 }
 
 void AddSC_instance_wailing_caverns()
diff --git a/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp b/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp
index e366d7c9fa8..6d47f293c13 100644
--- a/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp
+++ b/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp
@@ -95,7 +95,7 @@ struct TRINITY_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI
         if (!pInstance)
             return;
 
-        switch ( i )
+        switch (i)
         {
             case 4:
                 eventProgress = 1;
@@ -166,7 +166,7 @@ struct TRINITY_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(currentEvent != TYPE_NARALEX_PART3)
+        if (currentEvent != TYPE_NARALEX_PART3)
             npc_escortAI::UpdateAI(diff);
 
         if (!pInstance)
@@ -271,12 +271,12 @@ struct TRINITY_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI
                             if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX)))
                             {
                                 AchievementEntry const *AchievWC = GetAchievementStore()->LookupEntry(ACHIEVEMENT_WAILING_CAVERNS);
-                                if(AchievWC)
+                                if (AchievWC)
                                 {
-                                    Map *map = m_creature->GetMap();
-                                    if(map && map->IsDungeon())
+                                    Map* pMap = m_creature->GetMap();
+                                    if (pMap && pMap->IsDungeon())
                                     {
-                                        Map::PlayerList const &players = map->GetPlayers();
+                                        Map::PlayerList const &players = pMap->GetPlayers();
                                         for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                                             itr->getSource()->CompletedAchievement(AchievWC);
                                     }            
@@ -355,18 +355,18 @@ CreatureAI* GetAI_npc_disciple_of_naralex(Creature *_Creature)
     return disciple_of_naralexAI;
 }
 
-bool GossipHello_npc_disciple_of_naralex(Player *player, Creature *_Creature)
+bool GossipHello_npc_disciple_of_naralex(Player* pPlayer, Creature *_Creature)
 {
     ScriptedInstance *pInstance = (_Creature->GetInstanceData());
 
     if (pInstance)
     {
-        _Creature->CastSpell(player, SPELL_MARK_OF_THE_WILD_RANK_2, true);
+        _Creature->CastSpell(pPlayer, SPELL_MARK_OF_THE_WILD_RANK_2, true);
         if ((pInstance->GetData(TYPE_LORD_COBRAHN) == DONE) && (pInstance->GetData(TYPE_LORD_PYTHAS) == DONE) &&
             (pInstance->GetData(TYPE_LADY_ANACONDRA) == DONE) && (pInstance->GetData(TYPE_LORD_SERPENTIS) == DONE))
         {
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NARALEX, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->SEND_GOSSIP_MENU(GOSSIP_ID_START_2, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NARALEX, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START_2, _Creature->GetGUID());
 
             if (!pInstance->GetData(TYPE_NARALEX_YELLED))
             {
@@ -376,18 +376,18 @@ bool GossipHello_npc_disciple_of_naralex(Player *player, Creature *_Creature)
         }
         else
         {
-            player->SEND_GOSSIP_MENU(GOSSIP_ID_START_1, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START_1, _Creature->GetGUID());
         }
     }
     return true;
 }
 
-bool GossipSelect_npc_disciple_of_naralex(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_disciple_of_naralex(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     ScriptedInstance *pInstance = (_Creature->GetInstanceData());
     if (action == GOSSIP_ACTION_INFO_DEF + 1)
     {
-        player->CLOSE_GOSSIP_MENU();
+        pPlayer->CLOSE_GOSSIP_MENU();
         if (pInstance)pInstance->SetData(TYPE_NARALEX_EVENT, IN_PROGRESS);
 
         DoScriptText(SAY_MAKE_PREPARATIONS, _Creature);
@@ -395,7 +395,7 @@ bool GossipSelect_npc_disciple_of_naralex(Player *player, Creature *_Creature, u
         _Creature->setFaction(250);
         _Creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
 
-        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, false, player->GetGUID());
+        CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, false, pPlayer->GetGUID());
         CAST_AI(npc_escortAI, (_Creature->AI()))->SetDespawnAtFar(false);
         CAST_AI(npc_escortAI, (_Creature->AI()))->SetDespawnAtEnd(false);
     }
diff --git a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp
index 533480d1f6f..2abae29ccde 100644
--- a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp
+++ b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp
@@ -40,52 +40,52 @@ EndContentData */
 
 #define GOSSIP_SDA1 "Thanks, i need a Vitreous Focuser"
 
-bool GossipHello_npcs_dithers_and_arbington(Player *player, Creature *_Creature)
+bool GossipHello_npcs_dithers_and_arbington(Player* pPlayer, Creature *_Creature)
 {
-    if(_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
     if (_Creature->isVendor())
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
 
-    if(player->GetQuestRewardStatus(5237) || player->GetQuestRewardStatus(5238))
+    if (pPlayer->GetQuestRewardStatus(5237) || pPlayer->GetQuestRewardStatus(5238))
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
-        player->SEND_GOSSIP_MENU(3985, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HDA4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+        pPlayer->SEND_GOSSIP_MENU(3985, _Creature->GetGUID());
     }else
-        player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npcs_dithers_and_arbington(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npcs_dithers_and_arbington(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch(action)
     {
         case GOSSIP_ACTION_TRADE:
-            player->SEND_VENDORLIST( _Creature->GetGUID() );
+            pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-            player->SEND_GOSSIP_MENU(3980, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            pPlayer->SEND_GOSSIP_MENU(3980, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-            player->SEND_GOSSIP_MENU(3981, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            pPlayer->SEND_GOSSIP_MENU(3981, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-            player->SEND_GOSSIP_MENU(3982, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            pPlayer->SEND_GOSSIP_MENU(3982, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
-            player->SEND_GOSSIP_MENU(3983, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            pPlayer->SEND_GOSSIP_MENU(3983, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->CLOSE_GOSSIP_MENU();
-            _Creature->CastSpell(player, 17529, false);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            _Creature->CastSpell(pPlayer, 17529, false);
             break;
     }
     return true;
@@ -106,10 +106,10 @@ enum
 
 bool GossipHello_npc_myranda_the_hag(Player* pPlayer, Creature* pCreature)
 {
-    if(pCreature->isQuestGiver())
+    if (pCreature->isQuestGiver())
         pPlayer->PrepareQuestMenu(pCreature->GetGUID());
 
-    if(pPlayer->GetQuestStatus(QUEST_SUBTERFUGE) == QUEST_STATUS_COMPLETE &&
+    if (pPlayer->GetQuestStatus(QUEST_SUBTERFUGE) == QUEST_STATUS_COMPLETE &&
         !pPlayer->GetQuestRewardStatus(QUEST_IN_DREAMS) && !pPlayer->HasAura(SPELL_SCARLET_ILLUSION))
     {
         pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ILLUSION, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
@@ -124,7 +124,7 @@ bool GossipHello_npc_myranda_the_hag(Player* pPlayer, Creature* pCreature)
 
 bool GossipSelect_npc_myranda_the_hag(Player* pPlayer, Creature* pCreature, uint32 Sender, uint32 Action)
 {
-    if(Action == GOSSIP_ACTION_INFO_DEF + 1)
+    if (Action == GOSSIP_ACTION_INFO_DEF + 1)
     {
         pPlayer->CLOSE_GOSSIP_MENU();
         pCreature->CastSpell(pPlayer, SPELL_SCARLET_ILLUSION, false);
@@ -150,7 +150,7 @@ struct TRINITY_DLL_DECL npc_the_scourge_cauldronAI : public ScriptedAI
         m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
         //override any database `spawntimesecs` to prevent duplicated summons
         uint32 rTime = m_creature->GetRespawnDelay();
-        if( rTime<600 )
+        if (rTime<600)
             m_creature->SetRespawnDelay(600);
     }
 
@@ -159,37 +159,37 @@ struct TRINITY_DLL_DECL npc_the_scourge_cauldronAI : public ScriptedAI
         if (!who || who->GetTypeId() != TYPEID_PLAYER)
             return;
 
-        if(who->GetTypeId() == TYPEID_PLAYER)
+        if (who->GetTypeId() == TYPEID_PLAYER)
         {
             switch(m_creature->GetAreaId())
             {
                 case 199:                                   //felstone
-                    if( CAST_PLR(who)->GetQuestStatus(5216) == QUEST_STATUS_INCOMPLETE ||
-                        CAST_PLR(who)->GetQuestStatus(5229) == QUEST_STATUS_INCOMPLETE )
+                    if (CAST_PLR(who)->GetQuestStatus(5216) == QUEST_STATUS_INCOMPLETE ||
+                        CAST_PLR(who)->GetQuestStatus(5229) == QUEST_STATUS_INCOMPLETE)
                     {
                         m_creature->SummonCreature(11075, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
                         DoDie();
                     }
                     break;
                 case 200:                                   //dalson
-                    if( CAST_PLR(who)->GetQuestStatus(5219) == QUEST_STATUS_INCOMPLETE ||
-                        CAST_PLR(who)->GetQuestStatus(5231) == QUEST_STATUS_INCOMPLETE )
+                    if (CAST_PLR(who)->GetQuestStatus(5219) == QUEST_STATUS_INCOMPLETE ||
+                        CAST_PLR(who)->GetQuestStatus(5231) == QUEST_STATUS_INCOMPLETE)
                     {
                         m_creature->SummonCreature(11077, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
                         DoDie();
                     }
                     break;
                 case 201:                                   //gahrron
-                    if( CAST_PLR(who)->GetQuestStatus(5225) == QUEST_STATUS_INCOMPLETE ||
-                        CAST_PLR(who)->GetQuestStatus(5235) == QUEST_STATUS_INCOMPLETE )
+                    if (CAST_PLR(who)->GetQuestStatus(5225) == QUEST_STATUS_INCOMPLETE ||
+                        CAST_PLR(who)->GetQuestStatus(5235) == QUEST_STATUS_INCOMPLETE)
                     {
                         m_creature->SummonCreature(11078, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
                         DoDie();
                     }
                     break;
                 case 202:                                   //writhing
-                    if( CAST_PLR(who)->GetQuestStatus(5222) == QUEST_STATUS_INCOMPLETE ||
-                        CAST_PLR(who)->GetQuestStatus(5233) == QUEST_STATUS_INCOMPLETE )
+                    if (CAST_PLR(who)->GetQuestStatus(5222) == QUEST_STATUS_INCOMPLETE ||
+                        CAST_PLR(who)->GetQuestStatus(5233) == QUEST_STATUS_INCOMPLETE)
                     {
                         m_creature->SummonCreature(11076, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
                         DoDie();
diff --git a/src/bindings/scripts/scripts/zone/westfall/westfall.cpp b/src/bindings/scripts/scripts/zone/westfall/westfall.cpp
index 083e41476ad..b4f31c3e5df 100644
--- a/src/bindings/scripts/scripts/zone/westfall/westfall.cpp
+++ b/src/bindings/scripts/scripts/zone/westfall/westfall.cpp
@@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL npc_daphne_stilwellAI : public npc_escortAI
     {
         npc_escortAI::UpdateAI(diff);
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         if (uiShootTimer < diff)
@@ -208,9 +208,9 @@ struct TRINITY_DLL_DECL npc_defias_traitorAI : public npc_escortAI
 
     void WaypointReached(uint32 i)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
 
-        if (!player)
+        if (!pPlayer)
             return;
 
         switch (i)
@@ -219,13 +219,13 @@ struct TRINITY_DLL_DECL npc_defias_traitorAI : public npc_escortAI
                 SetRun(false);
                 break;
             case 36:
-                DoScriptText(SAY_PROGRESS, m_creature, player);
+                DoScriptText(SAY_PROGRESS, m_creature, pPlayer);
                 break;
             case 44:
-                DoScriptText(SAY_END, m_creature, player);
+                DoScriptText(SAY_END, m_creature, pPlayer);
                 {
-                    if (player)
-                        player->GroupEventHappens(QUEST_DEFIAS_BROTHERHOOD,m_creature);
+                    if (pPlayer)
+                        pPlayer->GroupEventHappens(QUEST_DEFIAS_BROTHERHOOD,m_creature);
                 }
                 break;
         }
@@ -246,8 +246,8 @@ struct TRINITY_DLL_DECL npc_defias_traitorAI : public npc_escortAI
     {
         if (PlayerGUID)
         {
-            if (Player* player = Unit::GetPlayer(PlayerGUID))
-                player->FailQuest(QUEST_DEFIAS_BROTHERHOOD);
+            if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
+                pPlayer->FailQuest(QUEST_DEFIAS_BROTHERHOOD);
         }
     }
 
@@ -257,12 +257,12 @@ struct TRINITY_DLL_DECL npc_defias_traitorAI : public npc_escortAI
     }
 };
 
-bool QuestAccept_npc_defias_traitor(Player* player, Creature* creature, Quest const* quest)
+bool QuestAccept_npc_defias_traitor(Player* pPlayer, Creature* creature, Quest const* quest)
 {
     if (quest->GetQuestId() == QUEST_DEFIAS_BROTHERHOOD)
     {
-        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, true, player->GetGUID());
-        DoScriptText(SAY_START, creature, player);
+        CAST_AI(npc_escortAI, (creature->AI()))->Start(true, true, pPlayer->GetGUID());
+        DoScriptText(SAY_START, creature, pPlayer);
     }
 
     return true;
diff --git a/src/bindings/scripts/scripts/zone/wintergrasp/wintergrasp.cpp b/src/bindings/scripts/scripts/zone/wintergrasp/wintergrasp.cpp
index f28187ee483..9eac05acc30 100644
--- a/src/bindings/scripts/scripts/zone/wintergrasp/wintergrasp.cpp
+++ b/src/bindings/scripts/scripts/zone/wintergrasp/wintergrasp.cpp
@@ -17,32 +17,32 @@
 #include "precompiled.h"
 #include "Wintergrasp.h"
 
-bool GossipHello_npc_demolisher_engineerer(Player *player, Creature *_creature)
+bool GossipHello_npc_demolisher_engineerer(Player* pPlayer, Creature *_creature)
 {
-    if(_creature->isQuestGiver())
-        player->PrepareQuestMenu(_creature->GetGUID());
+    if (_creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_creature->GetGUID());
 
-    if(player->HasAura(SPELL_CORPORAL))
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Build catapult.", GOSSIP_SENDER_MAIN,   GOSSIP_ACTION_INFO_DEF);
-    else if(player->HasAura(SPELL_LIEUTENANT))
+    if (pPlayer->HasAura(SPELL_CORPORAL))
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Build catapult.", GOSSIP_SENDER_MAIN,   GOSSIP_ACTION_INFO_DEF);
+    else if (pPlayer->HasAura(SPELL_LIEUTENANT))
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Build catapult.", GOSSIP_SENDER_MAIN,   GOSSIP_ACTION_INFO_DEF);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Build demolisher.", GOSSIP_SENDER_MAIN,   GOSSIP_ACTION_INFO_DEF+1);
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Build siege engine.", GOSSIP_SENDER_MAIN,   GOSSIP_ACTION_INFO_DEF+2);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Build catapult.", GOSSIP_SENDER_MAIN,   GOSSIP_ACTION_INFO_DEF);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Build demolisher.", GOSSIP_SENDER_MAIN,   GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Build siege engine.", GOSSIP_SENDER_MAIN,   GOSSIP_ACTION_INFO_DEF+2);
     }
 
-    player->SEND_GOSSIP_MENU(_creature->GetNpcTextId(), _creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_creature->GetNpcTextId(), _creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_demolisher_engineerer(Player* player, Creature* me, uint32 uiSender, uint32 uiAction)
+bool GossipSelect_npc_demolisher_engineerer(Player* pPlayer, Creature* me, uint32 uiSender, uint32 uiAction)
 {
-    player->CLOSE_GOSSIP_MENU();
+    pPlayer->CLOSE_GOSSIP_MENU();
     switch(uiAction - GOSSIP_ACTION_INFO_DEF)
     {
-        case 0: player->CastSpell(player, 56663, false, NULL, NULL, me->GetGUID()); break;
-        case 1: player->CastSpell(player, 56575, false, NULL, NULL, me->GetGUID()); break;
-        case 2: player->CastSpell(player, player->GetTeamId() ? 61408 : 56661, false, NULL, NULL, me->GetGUID()); break;
+        case 0: pPlayer->CastSpell(pPlayer, 56663, false, NULL, NULL, me->GetGUID()); break;
+        case 1: pPlayer->CastSpell(pPlayer, 56575, false, NULL, NULL, me->GetGUID()); break;
+        case 2: pPlayer->CastSpell(pPlayer, pPlayer->GetTeamId() ? 61408 : 56661, false, NULL, NULL, me->GetGUID()); break;
     }
 
     return true;
diff --git a/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp b/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp
index 8d857b35b46..f1737eec360 100644
--- a/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp
+++ b/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp
@@ -41,46 +41,46 @@ EndContentData */
 #define GOSSIP_SL4 "Then what happened?"
 #define GOSSIP_SL5 "He is not safe, i'll make sure of that."
 
-bool GossipHello_npc_lorax(Player *player, Creature *_Creature)
+bool GossipHello_npc_lorax(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (player->GetQuestStatus(5126) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(5126) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_lorax(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_lorax(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->SEND_GOSSIP_MENU(3759, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(3759, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(3760, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(3760, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
-            player->SEND_GOSSIP_MENU(3761, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            pPlayer->SEND_GOSSIP_MENU(3761, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
-            player->SEND_GOSSIP_MENU(3762, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            pPlayer->SEND_GOSSIP_MENU(3762, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
-            player->SEND_GOSSIP_MENU(3763, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            pPlayer->SEND_GOSSIP_MENU(3763, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->CLOSE_GOSSIP_MENU();
-            player->AreaExploredOrEventHappens(5126);
+            pPlayer->CLOSE_GOSSIP_MENU();
+            pPlayer->AreaExploredOrEventHappens(5126);
             break;
     }
     return true;
@@ -90,23 +90,23 @@ bool GossipSelect_npc_lorax(Player *player, Creature *_Creature, uint32 sender,
 ## npc_rivern_frostwind
 ######*/
 
-bool GossipHello_npc_rivern_frostwind(Player *player, Creature *_Creature)
+bool GossipHello_npc_rivern_frostwind(Player* pPlayer, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if (_Creature->isVendor() && player->GetReputationRank(589) == REP_EXALTED)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+    if (_Creature->isVendor() && pPlayer->GetReputationRank(589) == REP_EXALTED)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_rivern_frostwind(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_rivern_frostwind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_TRADE)
-        player->SEND_VENDORLIST( _Creature->GetGUID() );
+        pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
 
     return true;
 }
@@ -117,27 +117,27 @@ bool GossipSelect_npc_rivern_frostwind(Player *player, Creature *_Creature, uint
 
 #define GOSSIP_HWDM "I'd like you to make me a new Cache of Mau'ari please."
 
-bool GossipHello_npc_witch_doctor_mauari(Player *player, Creature *_Creature)
+bool GossipHello_npc_witch_doctor_mauari(Player* pPlayer, Creature *_Creature)
 {
-    if(_Creature->isQuestGiver())
-        player->PrepareQuestMenu( _Creature->GetGUID() );
+    if (_Creature->isQuestGiver())
+        pPlayer->PrepareQuestMenu(_Creature->GetGUID());
 
-    if(player->GetQuestRewardStatus(975))
+    if (pPlayer->GetQuestRewardStatus(975))
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HWDM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->SEND_GOSSIP_MENU(3377, _Creature->GetGUID());
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HWDM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->SEND_GOSSIP_MENU(3377, _Creature->GetGUID());
     }else
-        player->SEND_GOSSIP_MENU(3375, _Creature->GetGUID());
+        pPlayer->SEND_GOSSIP_MENU(3375, _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_witch_doctor_mauari(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_witch_doctor_mauari(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action==GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->CLOSE_GOSSIP_MENU();
-        _Creature->CastSpell(player, 16351, false);
+        pPlayer->CLOSE_GOSSIP_MENU();
+        _Creature->CastSpell(pPlayer, 16351, false);
     }
 
     return true;
diff --git a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp
index 6646fc70cfc..a083226bbb4 100644
--- a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp
+++ b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp
@@ -41,21 +41,21 @@ EndContentData */
 #define GOSSIP_REWARD_BLESS       -1000359
 //#define TEXT_BLESSINGS        "<You need higher standing with Cenarion Expedition to recive a blessing.>"
 
-bool GossipHello_npcs_ashyen_and_keleth(Player *player, Creature *_Creature )
+bool GossipHello_npcs_ashyen_and_keleth(Player* pPlayer, Creature *_Creature)
 {
-    if (player->GetReputationRank(942) > REP_NEUTRAL)
+    if (pPlayer->GetReputationRank(942) > REP_NEUTRAL)
     {
-        if ( _Creature->GetEntry() == 17900)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BLESS_ASH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        if ( _Creature->GetEntry() == 17901)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BLESS_KEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        if (_Creature->GetEntry() == 17900)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BLESS_ASH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        if (_Creature->GetEntry() == 17901)
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BLESS_KEL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
     }
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npcs_ashyen_and_keleth(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npcs_ashyen_and_keleth(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
@@ -63,53 +63,53 @@ bool GossipSelect_npcs_ashyen_and_keleth(Player *player, Creature *_Creature, ui
         _Creature->SetMaxPower(POWER_MANA,200);             //set a "fake" mana value, we can't depend on database doing it in this case
         _Creature->SetPower(POWER_MANA,200);
 
-        if ( _Creature->GetEntry() == 17900)                //check which creature we are dealing with
+        if (_Creature->GetEntry() == 17900)                //check which creature we are dealing with
         {
-            switch (player->GetReputationRank(942))
+            switch (pPlayer->GetReputationRank(942))
             {                                               //mark of lore
                 case REP_FRIENDLY:
-                    _Creature->CastSpell(player, 31808, true);
+                    _Creature->CastSpell(pPlayer, 31808, true);
                     DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
                 case REP_HONORED:
-                    _Creature->CastSpell(player, 31810, true);
+                    _Creature->CastSpell(pPlayer, 31810, true);
                     DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
                 case REP_REVERED:
-                    _Creature->CastSpell(player, 31811, true);
+                    _Creature->CastSpell(pPlayer, 31811, true);
                     DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
                 case REP_EXALTED:
-                    _Creature->CastSpell(player, 31815, true);
+                    _Creature->CastSpell(pPlayer, 31815, true);
                     DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
             }
         }
 
-        if ( _Creature->GetEntry() == 17901)
+        if (_Creature->GetEntry() == 17901)
         {
-            switch (player->GetReputationRank(942))         //mark of war
+            switch (pPlayer->GetReputationRank(942))         //mark of war
             {
                 case REP_FRIENDLY:
-                    _Creature->CastSpell(player, 31807, true);
+                    _Creature->CastSpell(pPlayer, 31807, true);
                     DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
                 case REP_HONORED:
-                    _Creature->CastSpell(player, 31812, true);
+                    _Creature->CastSpell(pPlayer, 31812, true);
                     DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
                 case REP_REVERED:
-                    _Creature->CastSpell(player, 31813, true);
+                    _Creature->CastSpell(pPlayer, 31813, true);
                     DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
                 case REP_EXALTED:
-                    _Creature->CastSpell(player, 31814, true);
+                    _Creature->CastSpell(pPlayer, 31814, true);
                     DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
             }
         }
-        player->CLOSE_GOSSIP_MENU();
-        player->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
+        pPlayer->CLOSE_GOSSIP_MENU();
+        pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
     }
     return true;
 }
@@ -148,10 +148,10 @@ struct TRINITY_DLL_DECL npc_cooshcooshAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if( LightningBolt_Timer < diff )
+        if (LightningBolt_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_LIGHTNING_BOLT);
             LightningBolt_Timer = 5000;
@@ -166,22 +166,22 @@ CreatureAI* GetAI_npc_cooshcoosh(Creature *_Creature)
     return new npc_cooshcooshAI (_Creature);
 }
 
-bool GossipHello_npc_cooshcoosh(Player *player, Creature *_Creature )
+bool GossipHello_npc_cooshcoosh(Player* pPlayer, Creature *_Creature)
 {
-    if( player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_COOSH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_COOSH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(9441, _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(9441, _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_cooshcoosh(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_cooshcoosh(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_INFO_DEF )
+    if (action == GOSSIP_ACTION_INFO_DEF)
     {
-        player->CLOSE_GOSSIP_MENU();
+        pPlayer->CLOSE_GOSSIP_MENU();
         _Creature->setFaction(FACTION_HOSTILE_CO);
-        _Creature->AI()->AttackStart(player);
+        _Creature->AI()->AttackStart(pPlayer);
     }
     return true;
 }
@@ -194,42 +194,42 @@ bool GossipSelect_npc_cooshcoosh(Player *player, Creature *_Creature, uint32 sen
 #define GOSSIP_ITEM_KUR2 "Im a messenger for Draenei"
 #define GOSSIP_ITEM_KUR3 "Get message"
 
-bool GossipHello_npc_elder_kuruti(Player *player, Creature *_Creature )
+bool GossipHello_npc_elder_kuruti(Player* pPlayer, Creature *_Creature)
 {
-    if( player->GetQuestStatus(9803) == QUEST_STATUS_INCOMPLETE )
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+    if (pPlayer->GetQuestStatus(9803) == QUEST_STATUS_INCOMPLETE)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
-    player->SEND_GOSSIP_MENU(9226,_Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(9226,_Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_elder_kuruti(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_elder_kuruti(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-            player->SEND_GOSSIP_MENU(9227, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            pPlayer->SEND_GOSSIP_MENU(9227, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 1:
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-            player->SEND_GOSSIP_MENU(9229, _Creature->GetGUID());
+            pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            pPlayer->SEND_GOSSIP_MENU(9229, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
         {
-            if( !player->HasItemCount(24573,1) )
+            if (!pPlayer->HasItemCount(24573,1))
             {
                 ItemPosCountVec dest;
-                uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, 24573, 1, false);
-                if( msg == EQUIP_ERR_OK )
+                uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 24573, 1, false);
+                if (msg == EQUIP_ERR_OK)
                 {
-                    player->StoreNewItem( dest, 24573, true);
+                    pPlayer->StoreNewItem(dest, 24573, true);
                 }
                 else
-                    player->SendEquipError( msg,NULL,NULL );
+                    pPlayer->SendEquipError(msg,NULL,NULL);
             }
-            player->SEND_GOSSIP_MENU(9231, _Creature->GetGUID());
+            pPlayer->SEND_GOSSIP_MENU(9231, _Creature->GetGUID());
             break;
         }
     }
@@ -240,21 +240,21 @@ bool GossipSelect_npc_elder_kuruti(Player *player, Creature *_Creature, uint32 s
 ## npc_mortog_steamhead
 ######*/
 
-bool GossipHello_npc_mortog_steamhead(Player *player, Creature *_Creature)
+bool GossipHello_npc_mortog_steamhead(Player* pPlayer, Creature *_Creature)
 {
-    if (_Creature->isVendor() && player->GetReputationRank(942) == REP_EXALTED)
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
+    if (_Creature->isVendor() && pPlayer->GetReputationRank(942) == REP_EXALTED)
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
 
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
     return true;
 }
 
-bool GossipSelect_npc_mortog_steamhead(Player *player, Creature *_Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_mortog_steamhead(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
     if (action == GOSSIP_ACTION_TRADE)
     {
-        player->SEND_VENDORLIST( _Creature->GetGUID() );
+        pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
     }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp
index 02e24257860..e597d93a1c7 100644
--- a/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp
+++ b/src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp
@@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
     boss_akilzonAI(Creature *c) : ScriptedAI(c)
     {
         SpellEntry *TempSpell = GET_SPELL(SPELL_ELECTRICAL_DAMAGE);
-        if(TempSpell)
+        if (TempSpell)
             TempSpell->EffectBasePoints[1] = 49;//disable bugged lightning until fixed in core
         pInstance = c->GetInstanceData();
     }
@@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_AKILZONEVENT, NOT_STARTED);
 
         StaticDisruption_Timer = (10+rand()%10)*1000; //10 to 20 seconds (bosskillers)
@@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
         DoYell(SAY_ONAGGRO, LANG_UNIVERSAL, NULL);
         DoPlaySoundToSet(m_creature, SOUND_ONAGGRO);
         //DoZoneInCombat();
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_AKILZONEVENT, IN_PROGRESS);
     }
 
@@ -125,7 +125,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
     {
         DoYell(SAY_ONDEATH,LANG_UNIVERSAL,NULL);
         DoPlaySoundToSet(m_creature, SOUND_ONDEATH);
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_AKILZONEVENT, DONE);
         DespawnSummons();
     }
@@ -150,7 +150,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
         for (uint8 i = 0; i < 8; ++i)
         {
             Unit* bird = Unit::GetUnit(*m_creature,BirdGUIDs[i]);
-            if(bird && bird->isAlive())
+            if (bird && bird->isAlive())
             {
                 bird->SetVisibility(VISIBILITY_OFF);
                 bird->setDeathState(JUST_DIED);
@@ -160,18 +160,18 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
 
     void SetWeather(uint32 weather, float grade)
     {
-        Map *map = m_creature->GetMap();
-        if (!map->IsDungeon()) return;
+        Map* pMap = m_creature->GetMap();
+        if (!pMap->IsDungeon()) return;
 
         WorldPacket data(SMSG_WEATHER, (4+4+4));
         data << uint32(weather) << (float)grade << uint8(0);
 
-        map->SendToPlayers(&data);
+        pMap->SendToPlayers(&data);
     }
 
     void HandleStormSequence(Unit *Cloud) // 1: begin, 2-9: tick, 10: end
     {
-        if(StormCount < 10 && StormCount > 1)
+        if (StormCount < 10 && StormCount > 1)
         {
             // deal damage
             int32 bp0 = 800;
@@ -199,7 +199,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
             //dealdamege
             for(std::list<Unit*>::iterator i = tempUnitMap.begin(); i != tempUnitMap.end(); ++i)
             {
-                if(!Cloud->IsWithinDist(*i, 6, false))
+                if (!Cloud->IsWithinDist(*i, 6, false))
                 {
                     Cloud->CastCustomSpell(*i, 43137, &bp0, NULL, NULL, true, 0, 0, m_creature->GetGUID());
                 }
@@ -211,7 +211,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
             {
                 x = 343+rand()%60;
                 y = 1380+rand()%60;
-                if(Unit *trigger = m_creature->SummonTrigger(x, y, z, 0, 2000))
+                if (Unit *trigger = m_creature->SummonTrigger(x, y, z, 0, 2000))
                 {
                     trigger->setFaction(35);
                     trigger->SetMaxHealth(100000);
@@ -223,7 +223,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
             }
         }
         StormCount++;
-        if(StormCount > 10)
+        if (StormCount > 10)
         {
             StormCount = 0; // finish
             SummonEagles_Timer = 5000;
@@ -242,18 +242,18 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(StormCount)
+        if (StormCount)
         {
             Unit* target = Unit::GetUnit(*m_creature, CloudGUID);
-            if(!target || !target->isAlive())
+            if (!target || !target->isAlive())
             {
                 EnterEvadeMode();
                 return;
             }
-            else if(Unit* Cyclone = Unit::GetUnit(*m_creature, CycloneGUID))
+            else if (Unit* Cyclone = Unit::GetUnit(*m_creature, CycloneGUID))
                 Cyclone->CastSpell(target, 25160, true); // keep casting or...
 
-            if(StormSequenceTimer < diff) {
+            if (StormSequenceTimer < diff) {
                 HandleStormSequence(target);
             }else StormSequenceTimer -= diff;
             return;
@@ -268,19 +268,19 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
 
         if (StaticDisruption_Timer < diff) {
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-            if(!target) target = m_creature->getVictim();
+            if (!target) target = m_creature->getVictim();
             TargetGUID = target->GetGUID();
             m_creature->CastSpell(target, SPELL_STATIC_DISRUPTION, false);
             m_creature->SetInFront(m_creature->getVictim());
             StaticDisruption_Timer = (10+rand()%8)*1000; // < 20s
 
-            /*if(float dist = m_creature->IsWithinDist3d(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 5.0f) dist = 5.0f;
+            /*if (float dist = m_creature->IsWithinDist3d(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 5.0f) dist = 5.0f;
             SDisruptAOEVisual_Timer = 1000 + floor(dist / 30 * 1000.0f);*/
         }else StaticDisruption_Timer -= diff;
 
         if (GustOfWind_Timer < diff) {
             Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1);
-            if(!target) target = m_creature->getVictim();
+            if (!target) target = m_creature->getVictim();
             DoCast(target, SPELL_GUST_OF_WIND);
             GustOfWind_Timer = (20+rand()%10)*1000; //20 to 30 seconds(bosskillers)
         } else GustOfWind_Timer -= diff;
@@ -297,7 +297,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
 
         if (ElectricalStorm_Timer < diff) {
             Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true);
-            if(!target)
+            if (!target)
             {
                 EnterEvadeMode();
                 return;
@@ -312,7 +312,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
                 target->SendMonsterMove(x,y,m_creature->GetPositionZ()+15,0);
             }
             Unit *Cloud = m_creature->SummonTrigger(x, y, m_creature->GetPositionZ()+16, 0, 15000);
-            if(Cloud)
+            if (Cloud)
             {
                 CloudGUID = Cloud->GetGUID();
                 Cloud->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING);
@@ -339,14 +339,14 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
             for (uint8 i = 0; i < 8; ++i)
             {
                 Unit* bird = Unit::GetUnit(*m_creature,BirdGUIDs[i]);
-                if(!bird)//they despawned on die
+                if (!bird)//they despawned on die
                 {
-                    if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                    if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                     {
                         x = target->GetPositionX() + 10 - rand()%20;
                         y = target->GetPositionY() + 10 - rand()%20;
                         z = target->GetPositionZ() + 6 + rand()%5 + 10;
-                        if(z > 95) z = 95 - rand()%5;
+                        if (z > 95) z = 95 - rand()%5;
                     }
                     Creature *pCreature = m_creature->SummonCreature(MOB_SOARING_EAGLE, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
                     if (pCreature)
@@ -387,9 +387,9 @@ struct TRINITY_DLL_DECL mob_soaring_eagleAI : public ScriptedAI
     void MovementInform(uint32, uint32)
     {
         arrived = true;
-        if(TargetGUID)
+        if (TargetGUID)
         {
-            if(Unit* target = Unit::GetUnit(*m_creature, TargetGUID))
+            if (Unit* target = Unit::GetUnit(*m_creature, TargetGUID))
                 m_creature->CastSpell(target, SPELL_EAGLE_SWOOP, true);
             TargetGUID = 0;
             m_creature->SetSpeed(MOVE_RUN, 1.2f);
@@ -399,20 +399,20 @@ struct TRINITY_DLL_DECL mob_soaring_eagleAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(EagleSwoop_Timer < diff) EagleSwoop_Timer = 0;
+        if (EagleSwoop_Timer < diff) EagleSwoop_Timer = 0;
         else EagleSwoop_Timer -= diff;
 
-        if(arrived)
+        if (arrived)
         {
-            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
             {
                 float x, y, z;
-                if(EagleSwoop_Timer)
+                if (EagleSwoop_Timer)
                 {
                     x = target->GetPositionX() + 10 - rand()%20;
                     y = target->GetPositionY() + 10 - rand()%20;
                     z = target->GetPositionZ() + 10 + rand()%5;
-                    if(z > 95) z = 95 - rand()%5;
+                    if (z > 95) z = 95 - rand()%5;
                 }
                 else
                 {
diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp
index ec264a7f9d1..62cab9fbd79 100644
--- a/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp
+++ b/src/bindings/scripts/scripts/zone/zulaman/boss_halazzi.cpp
@@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI
         pInstance = c->GetInstanceData();
         // need to find out what controls totem's spell cooldown
         SpellEntry *TempSpell = GET_SPELL(SPELL_LIGHTNING);
-        if(TempSpell && TempSpell->CastingTimeIndex != 5)
+        if (TempSpell && TempSpell->CastingTimeIndex != 5)
             TempSpell->CastingTimeIndex = 5; // 2000 ms casting time
     }
 
@@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_HALAZZIEVENT, NOT_STARTED);
 
         TransformCount = 0;
@@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS);
 
         DoYell(YELL_AGGRO, LANG_UNIVERSAL, NULL);
@@ -126,25 +126,25 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI
     void JustSummoned(Creature* summon)
     {
         summon->AI()->AttackStart(m_creature->getVictim());
-        if(summon->GetEntry() == MOB_SPIRIT_LYNX)
+        if (summon->GetEntry() == MOB_SPIRIT_LYNX)
             LynxGUID = summon->GetGUID();
     }
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(damage >= m_creature->GetHealth() && Phase != PHASE_ENRAGE)
+        if (damage >= m_creature->GetHealth() && Phase != PHASE_ENRAGE)
             damage = 0;
     }
 
     void SpellHit(Unit*, const SpellEntry *spell)
     {
-        if(spell->Id == SPELL_TRANSFORM_SPLIT2)
+        if (spell->Id == SPELL_TRANSFORM_SPLIT2)
             EnterPhase(PHASE_HUMAN);
     }
 
     void AttackStart(Unit *who)
     {
-        if(Phase != PHASE_MERGE) ScriptedAI::AttackStart(who);
+        if (Phase != PHASE_MERGE) ScriptedAI::AttackStart(who);
     }
 
     void EnterPhase(PhaseHalazzi NextPhase)
@@ -153,13 +153,13 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI
         {
         case PHASE_LYNX:
         case PHASE_ENRAGE:
-            if(Phase == PHASE_MERGE)
+            if (Phase == PHASE_MERGE)
             {
                 m_creature->CastSpell(m_creature, SPELL_TRANSFORM_MERGE, true);
                 m_creature->Attack(m_creature->getVictim(), true);
                 m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
             }
-            if(Unit *Lynx = Unit::GetUnit(*m_creature, LynxGUID))
+            if (Unit *Lynx = Unit::GetUnit(*m_creature, LynxGUID))
             {
                 Lynx->SetVisibility(VISIBILITY_OFF);
                 Lynx->setDeathState(JUST_DIED);
@@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI
             TotemTimer = 12000;
             break;
         case PHASE_MERGE:
-            if(Unit *Lynx = Unit::GetUnit(*m_creature, LynxGUID))
+            if (Unit *Lynx = Unit::GetUnit(*m_creature, LynxGUID))
             {
                 DoYell(YELL_MERGE, LANG_UNIVERSAL, NULL);
                 DoPlaySoundToSet(m_creature, SOUND_MERGE);
@@ -204,10 +204,10 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI
 
      void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(BerserkTimer < diff)
+        if (BerserkTimer < diff)
         {
             DoYell(YELL_BERSERK, LANG_UNIVERSAL, NULL);
             DoPlaySoundToSet(m_creature, SOUND_BERSERK);
@@ -215,9 +215,9 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI
             BerserkTimer = 60000;
         }else BerserkTimer -= diff;
 
-        if(Phase == PHASE_LYNX || Phase == PHASE_ENRAGE)
+        if (Phase == PHASE_LYNX || Phase == PHASE_ENRAGE)
         {
-            if(SaberlashTimer < diff)
+            if (SaberlashTimer < diff)
             {
                 // A tank with more than 490 defense skills should receive no critical hit
                 //m_creature->CastSpell(m_creature, 41296, true);
@@ -226,34 +226,34 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI
                 SaberlashTimer = 30000;
             }else SaberlashTimer -= diff;
 
-            if(FrenzyTimer < diff)
+            if (FrenzyTimer < diff)
             {
                 DoCast(m_creature, SPELL_FRENZY);
                 FrenzyTimer = (10+rand()%5)*1000;
             }else FrenzyTimer -= diff;
 
-            if(Phase == PHASE_LYNX)
-                if(CheckTimer < diff)
+            if (Phase == PHASE_LYNX)
+                if (CheckTimer < diff)
                 {
-                    if(m_creature->GetHealth() * 4 < m_creature->GetMaxHealth() * (3 - TransformCount))
+                    if (m_creature->GetHealth() * 4 < m_creature->GetMaxHealth() * (3 - TransformCount))
                         EnterPhase(PHASE_SPLIT);
                     CheckTimer = 1000;
                 }else CheckTimer -= diff;
         }
 
-        if(Phase == PHASE_HUMAN || Phase == PHASE_ENRAGE)
+        if (Phase == PHASE_HUMAN || Phase == PHASE_ENRAGE)
         {
-            if(TotemTimer < diff)
+            if (TotemTimer < diff)
             {
                 DoCast(m_creature, SPELL_SUMMON_TOTEM);
                 TotemTimer = 20000;
             }else TotemTimer -= diff;
 
-            if(ShockTimer < diff)
+            if (ShockTimer < diff)
             {
-                if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
+                if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
                 {
-                    if(target->IsNonMeleeSpellCasted(false))
+                    if (target->IsNonMeleeSpellCasted(false))
                         DoCast(target,SPELL_EARTHSHOCK);
                     else
                         DoCast(target,SPELL_FLAMESHOCK);
@@ -261,33 +261,33 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI
                 }
             }else ShockTimer -= diff;
 
-            if(Phase == PHASE_HUMAN)
-                if(CheckTimer < diff)
+            if (Phase == PHASE_HUMAN)
+                if (CheckTimer < diff)
                 {
-                    if( ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() <= 20)/*m_creature->GetHealth() * 10 < m_creature->GetMaxHealth()*/)
+                    if (((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() <= 20)/*m_creature->GetHealth() * 10 < m_creature->GetMaxHealth()*/)
                         EnterPhase(PHASE_MERGE);
                     else
                     {
                         Unit *Lynx = Unit::GetUnit(*m_creature, LynxGUID);
-                        if(Lynx && ((Lynx->GetHealth()*100) / Lynx->GetMaxHealth() <= 20)/*Lynx->GetHealth() * 10 < Lynx->GetMaxHealth()*/)
+                        if (Lynx && ((Lynx->GetHealth()*100) / Lynx->GetMaxHealth() <= 20)/*Lynx->GetHealth() * 10 < Lynx->GetMaxHealth()*/)
                             EnterPhase(PHASE_MERGE);
                     }
                     CheckTimer = 1000;
                 }else CheckTimer -= diff;
         }
 
-        if(Phase == PHASE_MERGE)
+        if (Phase == PHASE_MERGE)
         {
-            if(CheckTimer < diff)
+            if (CheckTimer < diff)
             {
                 Unit *Lynx = Unit::GetUnit(*m_creature, LynxGUID);
-                if(Lynx)
+                if (Lynx)
                 {
                     Lynx->GetMotionMaster()->MoveFollow(m_creature, 0, 0);
                     m_creature->GetMotionMaster()->MoveFollow(Lynx, 0, 0);
-                    if(m_creature->IsWithinDistInMap(Lynx, 6.0f))
+                    if (m_creature->IsWithinDistInMap(Lynx, 6.0f))
                     {
-                        if(TransformCount < 3)
+                        if (TransformCount < 3)
                             EnterPhase(PHASE_LYNX);
                         else
                             EnterPhase(PHASE_ENRAGE);
@@ -318,7 +318,7 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_HALAZZIEVENT, DONE);
 
         DoYell(YELL_DEATH, LANG_UNIVERSAL, NULL);
@@ -343,13 +343,13 @@ struct TRINITY_DLL_DECL boss_spiritlynxAI : public ScriptedAI
 
     void DamageTaken(Unit *done_by, uint32 &damage)
     {
-        if(damage >= m_creature->GetHealth())
+        if (damage >= m_creature->GetHealth())
             damage = 0;
     }
 
     void AttackStart(Unit *who)
     {
-        if(!m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (!m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             ScriptedAI::AttackStart(who);
     }
 
@@ -360,13 +360,13 @@ struct TRINITY_DLL_DECL boss_spiritlynxAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if(FrenzyTimer < diff)
+        if (FrenzyTimer < diff)
         {
             DoCast(m_creature, SPELL_LYNX_FRENZY);
             FrenzyTimer = (30+rand()%20)*1000;
         }else FrenzyTimer -= diff;
 
-        if(shredder_timer < diff)
+        if (shredder_timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SHRED_ARMOR);
             shredder_timer = 4000;
diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp
index ef18858f900..81aae062cb5 100644
--- a/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp
+++ b/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp
@@ -188,7 +188,7 @@ struct TRINITY_DLL_DECL boss_hexlord_addAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(pInstance && pInstance->GetData(DATA_HEXLORDEVENT) != IN_PROGRESS)
+        if (pInstance && pInstance->GetData(DATA_HEXLORDEVENT) != IN_PROGRESS)
         {
             EnterEvadeMode();
             return;
@@ -228,7 +228,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_HEXLORDEVENT, NOT_STARTED);
 
         SpiritBolts_Timer = 20000;
@@ -241,12 +241,12 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
         SpawnAdds();
 
         m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 46916);
-        m_creature->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE );
+        m_creature->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
     }
 
     void EnterCombat(Unit* who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS);
 
         DoZoneInCombat();
@@ -256,7 +256,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
         for(uint8 i = 0; i < 4; ++i)
         {
             Unit* Temp = Unit::GetUnit((*m_creature),AddGUID[i]);
-            if(Temp && Temp->isAlive())
+            if (Temp && Temp->isAlive())
                 CAST_CRE(Temp)->AI()->AttackStart(m_creature->getVictim());
             else
             {
@@ -283,7 +283,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
 
     void JustDied(Unit* victim)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_HEXLORDEVENT, DONE);
 
         DoYell(YELL_DEATH, LANG_UNIVERSAL, NULL);
@@ -292,7 +292,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
         for(uint8 i = 0; i < 4 ; ++i)
         {
             Unit* Temp = Unit::GetUnit((*m_creature),AddGUID[i]);
-            if(Temp && Temp->isAlive())
+            if (Temp && Temp->isAlive())
                 Temp->DealDamage(Temp, Temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
         }
     }
@@ -317,11 +317,11 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
         for(uint8 i = 0; i < 4; ++i)
         {
             Creature *pCreature = (Unit::GetCreature((*m_creature), AddGUID[i]));
-            if(!pCreature || !pCreature->isAlive())
+            if (!pCreature || !pCreature->isAlive())
             {
-                if(pCreature) pCreature->setDeathState(DEAD);
+                if (pCreature) pCreature->setDeathState(DEAD);
                 pCreature = m_creature->SummonCreature(AddEntry[i], Pos_X[i], POS_Y, POS_Z, ORIENT, TEMPSUMMON_DEAD_DESPAWN, 0);
-                if(pCreature) AddGUID[i] = pCreature->GetGUID();
+                if (pCreature) AddGUID[i] = pCreature->GetGUID();
             }
             else
             {
@@ -334,12 +334,12 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(ResetTimer < diff)
+        if (ResetTimer < diff)
         {
-            if(m_creature->IsWithinDist3d(119.223,1035.45,29.4481, 10))
+            if (m_creature->IsWithinDist3d(119.223,1035.45,29.4481, 10))
             {
                 EnterEvadeMode();
                 return;
@@ -347,18 +347,18 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
             ResetTimer = 5000;
         }else ResetTimer -= diff;
 
-        if(CheckAddState_Timer < diff)
+        if (CheckAddState_Timer < diff)
         {
             for(uint8 i = 0; i < 4; ++i)
             {
                 Unit* Temp = Unit::GetUnit((*m_creature),AddGUID[i]);
-                if(Temp && Temp->isAlive() && !Temp->getVictim())
+                if (Temp && Temp->isAlive() && !Temp->getVictim())
                     CAST_CRE(Temp)->AI()->AttackStart(m_creature->getVictim());
             }
             CheckAddState_Timer = 5000;
         }else CheckAddState_Timer -= diff;
 
-        if(DrainPower_Timer < diff)
+        if (DrainPower_Timer < diff)
         {
             m_creature->CastSpell(m_creature, SPELL_DRAIN_POWER, true);
             DoYell(YELL_DRAIN_POWER, LANG_UNIVERSAL, NULL);
@@ -366,9 +366,9 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
             DrainPower_Timer = 40000 + rand()%15000;    // must cast in 60 sec, or buff/debuff will disappear
         }else DrainPower_Timer -= diff;
 
-        if(SpiritBolts_Timer < diff)
+        if (SpiritBolts_Timer < diff)
         {
-            if(DrainPower_Timer < 12000)    // channel 10 sec
+            if (DrainPower_Timer < 12000)    // channel 10 sec
                 SpiritBolts_Timer = 13000;  // cast drain power first
             else
             {
@@ -381,11 +381,11 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
             }
         }else SpiritBolts_Timer -= diff;
 
-        if(SiphonSoul_Timer < diff)
+        if (SiphonSoul_Timer < diff)
         {
             Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 70, true);
             Unit *trigger = DoSpawnCreature(MOB_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000);
-            if(!target || !trigger)
+            if (!target || !trigger)
             {
                 EnterEvadeMode();
                 return;
@@ -404,16 +404,16 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
                 PlayerGUID = target->GetGUID();
                 PlayerAbility_Timer = 8000 + rand()%2000;
                 PlayerClass = target->getClass() - 1;
-                if(PlayerClass == 10) PlayerClass = 9; // druid
-                if(PlayerClass == 4 && target->HasSpell(15473)) PlayerClass = 5; // shadow priest
+                if (PlayerClass == 10) PlayerClass = 9; // druid
+                if (PlayerClass == 4 && target->HasSpell(15473)) PlayerClass = 5; // shadow priest
                 SiphonSoul_Timer = 99999;   // buff lasts 30 sec
             }
         }else SiphonSoul_Timer -= diff;
 
-        if(PlayerAbility_Timer < diff)
+        if (PlayerAbility_Timer < diff)
         {
             //Unit* target = Unit::GetUnit(*m_creature, PlayerGUID);
-            //if(target && target->isAlive())
+            //if (target && target->isAlive())
             {
                 UseAbility();
                 PlayerAbility_Timer = 8000 + rand()%2000;
@@ -445,11 +445,11 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
         case ABILITY_TARGET_BUFF:
             {
                 std::list<Creature*> templist = DoFindFriendlyMissingBuff(50, PlayerAbility[PlayerClass][random].spell);
-                if(!templist.empty()) target = *(templist.begin());
+                if (!templist.empty()) target = *(templist.begin());
             }
             break;
         }
-        if(target)
+        if (target)
             m_creature->CastSpell(target, PlayerAbility[PlayerClass][random].spell, false);
     }
 };
@@ -475,21 +475,21 @@ struct TRINITY_DLL_DECL boss_thurgAI : public boss_hexlord_addAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(bloodlust_timer < diff)
+        if (bloodlust_timer < diff)
         {
             std::list<Creature*> templist = DoFindFriendlyMissingBuff(50, SPELL_BLOODLUST);
-            if(!templist.empty())
+            if (!templist.empty())
             {
-                if(Unit* target = *(templist.begin()))
+                if (Unit* target = *(templist.begin()))
                     m_creature->CastSpell(target, SPELL_BLOODLUST, false);
             }
             bloodlust_timer = 12000;
         }else bloodlust_timer -= diff;
 
-        if(cleave_timer < diff)
+        if (cleave_timer < diff)
         {
             m_creature->CastSpell(m_creature->getVictim(),SPELL_CLEAVE, false);
             cleave_timer = 12000; //3 sec cast
@@ -527,7 +527,7 @@ struct TRINITY_DLL_DECL boss_alyson_antilleAI : public boss_hexlord_addAI
 
         if (who->isTargetableForAttack())
         {
-            if(m_creature->Attack(who, false))
+            if (m_creature->Attack(who, false))
             {
                 m_creature->GetMotionMaster()->MoveChase(who, 20);
                 m_creature->AddThreat(who, 0.0f);
@@ -537,15 +537,15 @@ struct TRINITY_DLL_DECL boss_alyson_antilleAI : public boss_hexlord_addAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(flashheal_timer < diff)
+        if (flashheal_timer < diff)
         {
             Unit* target = DoSelectLowestHpFriendly(99, 30000);
-            if(target)
+            if (target)
             {
-                if(target->IsWithinDistInMap(m_creature, 50))
+                if (target->IsWithinDistInMap(m_creature, 50))
                     m_creature->CastSpell(target,SPELL_FLASH_HEAL, false);
                 else
                 {
@@ -556,20 +556,20 @@ struct TRINITY_DLL_DECL boss_alyson_antilleAI : public boss_hexlord_addAI
             }
             else
             {
-                if(rand()%2)
+                if (rand()%2)
                 {
-                    if(target = DoSelectLowestHpFriendly(50, 0))
+                    if (target = DoSelectLowestHpFriendly(50, 0))
                         m_creature->CastSpell(target, SPELL_DISPEL_MAGIC, false);
                 }
-                else if(target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                else if (target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                     m_creature->CastSpell(target, SPELL_DISPEL_MAGIC, false);
             }
             flashheal_timer = 2500;
         }else flashheal_timer -= diff;
 
-        /*if(dispelmagic_timer < diff)
+        /*if (dispelmagic_timer < diff)
         {
-        if(rand()%2)
+        if (rand()%2)
         {
         Unit* target = SelectTarget();
 
@@ -606,7 +606,7 @@ struct TRINITY_DLL_DECL boss_gazakrothAI : public boss_hexlord_addAI
 
         if (who->isTargetableForAttack())
         {
-            if(m_creature->Attack(who, false))
+            if (m_creature->Attack(who, false))
             {
                 m_creature->GetMotionMaster()->MoveChase(who, 20);
                 m_creature->AddThreat(who, 0.0f);
@@ -616,10 +616,10 @@ struct TRINITY_DLL_DECL boss_gazakrothAI : public boss_hexlord_addAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if(firebolt_timer < diff)
+        if (firebolt_timer < diff)
         {
             m_creature->CastSpell(m_creature->getVictim(),SPELL_FIREBOLT, false);
             firebolt_timer = 700;
@@ -649,7 +649,7 @@ struct TRINITY_DLL_DECL boss_lord_raadanAI : public boss_hexlord_addAI
     }
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (thunderclap_timer < diff)
@@ -685,7 +685,7 @@ struct TRINITY_DLL_DECL boss_darkheartAI : public boss_hexlord_addAI
     }
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (psychicwail_timer < diff)
@@ -720,7 +720,7 @@ struct TRINITY_DLL_DECL boss_slitherAI : public boss_hexlord_addAI
 
         if (who->isTargetableForAttack())
         {
-            if(m_creature->Attack(who, false))
+            if (m_creature->Attack(who, false))
             {
                 m_creature->GetMotionMaster()->MoveChase(who, 20);
                 m_creature->AddThreat(who, 0.0f);
@@ -730,12 +730,12 @@ struct TRINITY_DLL_DECL boss_slitherAI : public boss_hexlord_addAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (venomspit_timer < diff)
         {
-            if(Unit* victim = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            if (Unit* victim = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 m_creature->CastSpell(victim,SPELL_VENOM_SPIT, false);
             venomspit_timer = 2500;
         }else venomspit_timer -= diff;
@@ -762,7 +762,7 @@ struct TRINITY_DLL_DECL boss_fenstalkerAI : public boss_hexlord_addAI
     }
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (volatileinf_timer < diff)
@@ -798,7 +798,7 @@ struct TRINITY_DLL_DECL boss_koraggAI : public boss_hexlord_addAI
     }
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         if (mightyblow_timer < diff)
@@ -808,7 +808,7 @@ struct TRINITY_DLL_DECL boss_koraggAI : public boss_hexlord_addAI
         }
         if (coldstare_timer < diff)
         {
-            if(Unit* victim = SelectUnit(SELECT_TARGET_RANDOM, 0))
+            if (Unit* victim = SelectUnit(SELECT_TARGET_RANDOM, 0))
                 m_creature->CastSpell(victim,SPELL_COLD_STARE, false);
             coldstare_timer = 12000;
         }
diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp
index d45829e94fa..91d3153622e 100644
--- a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp
+++ b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp
@@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
         pInstance =c->GetInstanceData();
 
         SpellEntry *TempSpell = GET_SPELL(SPELL_HATCH_EGG);
-        if(TempSpell && TempSpell->EffectImplicitTargetA[0] != 1)
+        if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 1)
         {
             TempSpell->EffectImplicitTargetA[0] = 1;
             TempSpell->EffectImplicitTargetB[0] = 0;
@@ -133,7 +133,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_JANALAIEVENT, NOT_STARTED);
 
         FireBreathTimer = 8000;
@@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
     {
         DoScriptText(SAY_DEATH, m_creature);
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_JANALAIEVENT, DONE);
     }
 
@@ -174,7 +174,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_JANALAIEVENT, IN_PROGRESS);
 
         DoScriptText(SAY_AGGRO, m_creature);
@@ -183,9 +183,9 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
 
     void DamageDeal(Unit* target, uint32 &damage)
     {
-        if(isFlameBreathing)
+        if (isFlameBreathing)
         {
-            if(!m_creature->HasInArc(M_PI/6, target))
+            if (!m_creature->HasInArc(M_PI/6, target))
                 damage = 0;
         }
     }
@@ -196,18 +196,18 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
         Creature* wall = NULL;
         for(uint8 i = 0; i < 4; ++i)
         {
-            if(i == 0 || i == 2)
+            if (i == 0 || i == 2)
                 WallNum = 3;
             else
                 WallNum = 2;
 
             for(uint8 j = 0; j < WallNum; j++)
             {
-                if(WallNum == 3)
+                if (WallNum == 3)
                     wall = m_creature->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0],FireWallCoords[i][1]+5*(j-1),FireWallCoords[i][2],FireWallCoords[i][3],TEMPSUMMON_TIMED_DESPAWN,15000);
                 else
                     wall = m_creature->SummonCreature(MOB_FIRE_BOMB, FireWallCoords[i][0]-2+4*j,FireWallCoords[i][1],FireWallCoords[i][2],FireWallCoords[i][3],TEMPSUMMON_TIMED_DESPAWN,15000);
-                if(wall) wall->CastSpell(wall, SPELL_FIRE_WALL, true);
+                if (wall) wall->CastSpell(wall, SPELL_FIRE_WALL, true);
             }
         }
     }
@@ -215,13 +215,13 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
     void SpawnBombs()
     {
         float dx, dy;
-        for( int i(0); i < 40; ++i)
+        for(int i(0); i < 40; ++i)
         {
             dx =(rand()%(area_dx))-(area_dx/2);
             dy =(rand()%(area_dy))-(area_dy/2);
 
             Creature* bomb = DoSpawnCreature(MOB_FIRE_BOMB, dx, dy, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 15000);
-            if(bomb) FireBombGUIDs[i] = bomb->GetGUID();
+            if (bomb) FireBombGUIDs[i] = bomb->GetGUID();
         }
         BombCount = 0;
     }
@@ -248,14 +248,14 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
         }
 
         //error_log("Eggs %d at middle", templist.size());
-        if(!templist.size())
+        if (!templist.size())
             return false;
 
         for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
         {
-            if(action == 1)
+            if (action == 1)
                (*i)->SetDisplayId(10056);
-            else if(action == 2 &&(*i)->GetDisplayId() != 11686)
+            else if (action == 2 &&(*i)->GetDisplayId() != 11686)
                (*i)->CastSpell(*i, SPELL_HATCH_EGG, false);
         }
         return true;
@@ -290,16 +290,16 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
 
     void HandleBombSequence()
     {
-        if(BombCount < 40)
+        if (BombCount < 40)
         {
-            if(Unit *FireBomb = Unit::GetUnit((*m_creature), FireBombGUIDs[BombCount]))
+            if (Unit *FireBomb = Unit::GetUnit((*m_creature), FireBombGUIDs[BombCount]))
             {
                 FireBomb->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 DoCast(FireBomb, SPELL_FIRE_BOMB_THROW, true);
                 FireBomb->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             }
             BombCount++;
-            if(BombCount == 40)
+            if (BombCount == 40)
             {
                 BombSequenceTimer = 5000;
             }else BombSequenceTimer = 100;
@@ -310,7 +310,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
             isBombing = false;
             BombTimer = 20000+rand()%20000;
             m_creature->RemoveAurasDueToSpell(SPELL_FIRE_BOMB_CHANNEL);
-            if(EnrageTimer <= 10000)
+            if (EnrageTimer <= 10000)
                 EnrageTimer = 0;
             else
                 EnrageTimer -= 10000;
@@ -319,33 +319,33 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(isFlameBreathing)
+        if (isFlameBreathing)
         {
-            if(!m_creature->IsNonMeleeSpellCasted(false))
+            if (!m_creature->IsNonMeleeSpellCasted(false))
             {
                 isFlameBreathing = false;
             }else return;
         }
 
-        if(isBombing)
+        if (isBombing)
         {
-            if(BombSequenceTimer < diff)
+            if (BombSequenceTimer < diff)
             {
                 HandleBombSequence();
             }else BombSequenceTimer -= diff;
             return;
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         //enrage if under 25% hp before 5 min.
-        if(!enraged && m_creature->GetHealth() * 4 < m_creature->GetMaxHealth())
+        if (!enraged && m_creature->GetHealth() * 4 < m_creature->GetMaxHealth())
             EnrageTimer = 0;
 
-        if(EnrageTimer < diff)
+        if (EnrageTimer < diff)
         {
-            if(!enraged)
+            if (!enraged)
             {
                 m_creature->CastSpell(m_creature, SPELL_ENRAGE, true);
                 enraged = true;
@@ -359,7 +359,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
             }
         }else EnrageTimer -= diff;
 
-        if(BombTimer < diff)
+        if (BombTimer < diff)
         {
             DoScriptText(SAY_FIRE_BOMBS, m_creature);
 
@@ -377,22 +377,22 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
             BombSequenceTimer = 100;
 
             //Teleport every Player into the middle
-            Map *map = m_creature->GetMap();
-            if(!map->IsDungeon()) return;
-            Map::PlayerList const &PlayerList = map->GetPlayers();
+            Map* pMap = m_creature->GetMap();
+            if (!pMap->IsDungeon()) return;
+            Map::PlayerList const &PlayerList = pMap->GetPlayers();
             for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
             {
                 if (Player* i_pl = i->getSource())
-                    if(i_pl->isAlive())
+                    if (i_pl->isAlive())
                         DoTeleportPlayer(i_pl, JanalainPos[0][0]-5+rand()%10, JanalainPos[0][1]-5+rand()%10, JanalainPos[0][2], 0);
             }
             //m_creature->CastSpell(Temp, SPELL_SUMMON_PLAYERS, true); // core bug, spell does not work if too far
             return;
         }else BombTimer -= diff;
 
-        if(!noeggs)
+        if (!noeggs)
         {
-            if(100 * m_creature->GetHealth() < 35 * m_creature->GetMaxHealth())
+            if (100 * m_creature->GetHealth() < 35 * m_creature->GetMaxHealth())
             {
                 DoScriptText(SAY_ALL_EGGS, m_creature);
 
@@ -404,9 +404,9 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
                 HatchAllEggs(2);
                 noeggs = true;
             }
-            else if(HatcherTimer < diff)
+            else if (HatcherTimer < diff)
             {
-                if(HatchAllEggs(0))
+                if (HatchAllEggs(0))
                 {
                     DoScriptText(SAY_SUMMON_HATCHER, m_creature);
                     m_creature->SummonCreature(MOB_AMANI_HATCHER,hatcherway[0][0][0],hatcherway[0][0][1],hatcherway[0][0][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000);
@@ -422,9 +422,9 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
 
         DoMeleeAttackIfReady();
 
-        if(FireBreathTimer < diff)
+        if (FireBreathTimer < diff)
         {
-            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
+            if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
             {
                 m_creature->AttackStop();
                 m_creature->GetMotionMaster()->Clear();
@@ -450,7 +450,7 @@ struct TRINITY_DLL_DECL mob_janalai_firebombAI : public ScriptedAI
 
     void SpellHit(Unit *caster, const SpellEntry *spell)
     {
-        if(spell->Id == SPELL_FIRE_BOMB_THROW)
+        if (spell->Id == SPELL_FIRE_BOMB_THROW)
             m_creature->CastSpell(m_creature, SPELL_FIRE_BOMB_DUMMY, true);
     }
 
@@ -520,14 +520,14 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI
 
         for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end() && num > 0; ++i)
         {
-            if((*i)->GetDisplayId() != 11686)
+            if ((*i)->GetDisplayId() != 11686)
             {
                (*i)->CastSpell(*i, SPELL_HATCH_EGG, false);
                 num--;
             }
         }
 
-        if(num)
+        if (num)
             return false;   // no more templist
         else
             return true;
@@ -538,7 +538,7 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI
     void MoveInLineOfSight(Unit* who) {}
     void MovementInform(uint32, uint32)
     {
-        if(waypoint == 5)
+        if (waypoint == 5)
         {
             isHatching = true;
             HatchNum = 1;
@@ -550,16 +550,16 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!pInstance || !(pInstance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS))
+        if (!pInstance || !(pInstance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS))
         {
             m_creature->SetVisibility(VISIBILITY_OFF);
             m_creature->setDeathState(JUST_DIED);
             return;
         }
 
-        if(!isHatching)
+        if (!isHatching)
         {
-            if(WaitTimer)
+            if (WaitTimer)
             {
                 m_creature->GetMotionMaster()->Clear();
                 m_creature->GetMotionMaster()->MovePoint(0,hatcherway[side][waypoint][0],hatcherway[side][waypoint][1],hatcherway[side][waypoint][2]);
@@ -569,14 +569,14 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI
         }
         else
         {
-            if(WaitTimer < diff)
+            if (WaitTimer < diff)
             {
-                if(HatchEggs(HatchNum))
+                if (HatchEggs(HatchNum))
                 {
                     HatchNum++;
                     WaitTimer = 10000;
                 }
-                else if(!hasChangedSide)
+                else if (!hasChangedSide)
                 {
                     side = side ? 0 : 1;
                     isHatching = false;
@@ -612,7 +612,7 @@ struct TRINITY_DLL_DECL mob_hatchlingAI : public ScriptedAI
     void Reset()
     {
         BuffetTimer = 7000;
-        if(m_creature->GetPositionY() > 1150)
+        if (m_creature->GetPositionY() > 1150)
             m_creature->GetMotionMaster()->MovePoint(0, hatcherway[0][3][0]+rand()%4-2,1150+rand()%4-2,hatcherway[0][3][2]);
         else
             m_creature->GetMotionMaster()->MovePoint(0,hatcherway[1][3][0]+rand()%4-2,1150+rand()%4-2,hatcherway[1][3][2]);
@@ -624,17 +624,17 @@ struct TRINITY_DLL_DECL mob_hatchlingAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!pInstance || !(pInstance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS))
+        if (!pInstance || !(pInstance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS))
         {
             m_creature->SetVisibility(VISIBILITY_OFF);
             m_creature->setDeathState(JUST_DIED);
             return;
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(BuffetTimer < diff)
+        if (BuffetTimer < diff)
         {
             m_creature->CastSpell(m_creature->getVictim(), SPELL_FLAMEBUFFET, false);
             BuffetTimer = 10000;
@@ -660,7 +660,7 @@ struct TRINITY_DLL_DECL mob_eggAI : public ScriptedAI
 
     void SpellHit(Unit *caster, const SpellEntry *spell)
     {
-        if(spell->Id == SPELL_HATCH_EGG)
+        if (spell->Id == SPELL_HATCH_EGG)
         {
             DoSpawnCreature(MOB_HATCHLING, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
             m_creature->SetDisplayId(11686);
diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp
index 80f2c754e8d..bfca36e39b9 100644
--- a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp
+++ b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp
@@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
 
     void Reset()
     {
-        if(MoveEvent)
+        if (MoveEvent)
         {
             m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
             (*m_creature).GetMotionMaster()->MovePoint(0,NalorakkWay[7][0],NalorakkWay[7][1],NalorakkWay[7][2]);
         }
 
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_NALORAKKEVENT, NOT_STARTED);
 
         Surge_Timer = 15000 + rand()%5000;
@@ -166,12 +166,12 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
             cell_lock->Visit(cell_lock, cSearcher, *(m_creature->GetMap()));
         }
 
-        if(!templist.size())
+        if (!templist.size())
             return;
 
         for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
         {
-            if((*i) && m_creature->IsWithinDistInMap((*i),25))
+            if ((*i) && m_creature->IsWithinDistInMap((*i),25))
             {
                 (*i)->SetNoCallAssistance(true);
                 (*i)->AI()->AttackStart(target);
@@ -181,26 +181,26 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
 
     void AttackStart(Unit* who)
     {
-        if(!MoveEvent)
+        if (!MoveEvent)
             ScriptedAI::AttackStart(who);
     }
 
     void MoveInLineOfSight(Unit *who)
     {
-        if(!MoveEvent)
+        if (!MoveEvent)
         {
             ScriptedAI::MoveInLineOfSight(who);
         }
         else
         {
-            if(m_creature->IsHostileTo( who ))
+            if (m_creature->IsHostileTo(who))
             {
-                if(!inMove)
+                if (!inMove)
                 {
                     switch(MovePhase)
                     {
                         case 0:
-                            if(m_creature->IsWithinDistInMap(who, 50))
+                            if (m_creature->IsWithinDistInMap(who, 50))
                             {
                                 DoYell(YELL_NALORAKK_WAVE1, LANG_UNIVERSAL, NULL);
                                 DoPlaySoundToSet(m_creature, SOUND_NALORAKK_WAVE1);
@@ -213,7 +213,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
                             }
                             break;
                         case 2:
-                            if(m_creature->IsWithinDistInMap(who, 40))
+                            if (m_creature->IsWithinDistInMap(who, 40))
                             {
                                 DoYell(YELL_NALORAKK_WAVE2, LANG_UNIVERSAL, NULL);
                                 DoPlaySoundToSet(m_creature, SOUND_NALORAKK_WAVE2);
@@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
                             }
                             break;
                         case 5:
-                            if(m_creature->IsWithinDistInMap(who, 40))
+                            if (m_creature->IsWithinDistInMap(who, 40))
                             {
                                 DoYell(YELL_NALORAKK_WAVE3, LANG_UNIVERSAL, NULL);
                                 DoPlaySoundToSet(m_creature, SOUND_NALORAKK_WAVE3);
@@ -239,7 +239,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
                             }
                             break;
                         case 7:
-                            if(m_creature->IsWithinDistInMap(who, 50))
+                            if (m_creature->IsWithinDistInMap(who, 50))
                             {
                                 SendAttacker(who);
 
@@ -260,7 +260,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS);
 
         DoYell(YELL_AGGRO, LANG_UNIVERSAL, NULL);
@@ -270,7 +270,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_NALORAKKEVENT, DONE);
 
         DoYell(YELL_DEATH,LANG_UNIVERSAL,NULL);
@@ -294,15 +294,15 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
 
     void MovementInform(uint32 type, uint32 id)
     {
-        if(MoveEvent)
+        if (MoveEvent)
         {
-            if(type != POINT_MOTION_TYPE)
+            if (type != POINT_MOTION_TYPE)
                 return;
 
-            if(!inMove)
+            if (!inMove)
                 return;
 
-            if(MovePhase != id)
+            if (MovePhase != id)
                 return;
 
             switch(MovePhase)
@@ -334,10 +334,10 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(waitTimer)
+        if (waitTimer)
         {
-            if(inMove)
-                if(waitTimer < diff)
+            if (inMove)
+                if (waitTimer < diff)
                 {
                     (*m_creature).GetMotionMaster()->MovementExpired();
                     (*m_creature).GetMotionMaster()->MovePoint(MovePhase,NalorakkWay[MovePhase][0],NalorakkWay[MovePhase][1],NalorakkWay[MovePhase][2]);
@@ -345,10 +345,10 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
                 }else waitTimer -= diff;
         }
 
-        if(!UpdateVictim())
+        if (!UpdateVictim())
             return;
 
-        if(Berserk_Timer < diff)
+        if (Berserk_Timer < diff)
         {
             DoCast(m_creature, SPELL_BERSERK, true);
             DoYell(YELL_BERSERK, LANG_UNIVERSAL, NULL);
@@ -356,9 +356,9 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
             Berserk_Timer = 600000;
         }else Berserk_Timer -= diff;
 
-        if(ShapeShift_Timer < diff)
+        if (ShapeShift_Timer < diff)
         {
-            if(inBearForm)
+            if (inBearForm)
             {
                 m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, 5122);
                 DoYell(YELL_SHIFTEDTOTROLL, LANG_UNIVERSAL, NULL);
@@ -384,17 +384,17 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
             }
         }else ShapeShift_Timer -= diff;
 
-        if(!inBearForm)
+        if (!inBearForm)
         {
-            if(BrutalSwipe_Timer < diff)
+            if (BrutalSwipe_Timer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_BRUTALSWIPE);
                 BrutalSwipe_Timer = 7000 + rand()%5000;
             }else BrutalSwipe_Timer -= diff;
 
-            if(Mangle_Timer < diff)
+            if (Mangle_Timer < diff)
             {
-                if(m_creature->getVictim() && !m_creature->getVictim()->HasAura(SPELL_MANGLEEFFECT))
+                if (m_creature->getVictim() && !m_creature->getVictim()->HasAura(SPELL_MANGLEEFFECT))
                 {
                     DoCast(m_creature->getVictim(), SPELL_MANGLE);
                     Mangle_Timer = 1000;
@@ -402,31 +402,31 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
                 else Mangle_Timer = 10000 + rand()%5000;
             }else Mangle_Timer -= diff;
 
-            if(Surge_Timer < diff)
+            if (Surge_Timer < diff)
             {
                 DoYell(YELL_SURGE, LANG_UNIVERSAL, NULL);
                 DoPlaySoundToSet(m_creature, SOUND_YELL_SURGE);
                 Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true);
-                if(target)
+                if (target)
                     DoCast(target, SPELL_SURGE);
                 Surge_Timer = 15000 + rand()%5000;
             }else Surge_Timer -= diff;
         }
         else
         {
-            if(LaceratingSlash_Timer < diff)
+            if (LaceratingSlash_Timer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_LACERATINGSLASH);
                 LaceratingSlash_Timer = 18000 + rand()%5000;
             }else LaceratingSlash_Timer -= diff;
 
-            if(RendFlesh_Timer < diff)
+            if (RendFlesh_Timer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_RENDFLESH);
                 RendFlesh_Timer = 5000 + rand()%5000;
             }else RendFlesh_Timer -= diff;
 
-            if(DeafeningRoar_Timer < diff)
+            if (DeafeningRoar_Timer < diff)
             {
                 DoCast(m_creature->getVictim(), SPELL_DEAFENINGROAR);
                 DeafeningRoar_Timer = 15000 + rand()%5000;
diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp
index 4a6a3e52d7d..df08fff03ff 100644
--- a/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp
+++ b/src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp
@@ -176,7 +176,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
 
     void Reset()
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ZULJINEVENT, NOT_STARTED);
 
         Phase = 0;
@@ -213,7 +213,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
 
     void EnterCombat(Unit *who)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ZULJINEVENT, IN_PROGRESS);
 
         DoZoneInCombat();
@@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
 
     void KilledUnit(Unit* victim)
     {
-        if(Intro_Timer)
+        if (Intro_Timer)
             return;
 
         switch(rand()%2)
@@ -244,20 +244,20 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        if(pInstance)
+        if (pInstance)
             pInstance->SetData(DATA_ZULJINEVENT, DONE);
 
         DoYell(YELL_DEATH, LANG_UNIVERSAL, NULL);
         DoPlaySoundToSet(m_creature, SOUND_DEATH);
         Summons.DespawnEntry(CREATURE_COLUMN_OF_FIRE);
 
-        if(Unit *Temp = Unit::GetUnit(*m_creature, SpiritGUID[3]))
+        if (Unit *Temp = Unit::GetUnit(*m_creature, SpiritGUID[3]))
             Temp->SetUInt32Value(UNIT_FIELD_BYTES_1,UNIT_STAND_STATE_DEAD);
     }
 
     void AttackStart(Unit *who)
     {
-        if(Phase == 2)
+        if (Phase == 2)
             AttackStartNoMove(who);
         else
             ScriptedAI::AttackStart(who);
@@ -265,15 +265,15 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
 
     void DoMeleeAttackIfReady()
     {
-        if( !m_creature->IsNonMeleeSpellCasted(false))
+        if (!m_creature->IsNonMeleeSpellCasted(false))
         {
-            if(m_creature->isAttackReady() && m_creature->IsWithinMeleeRange(m_creature->getVictim()))
+            if (m_creature->isAttackReady() && m_creature->IsWithinMeleeRange(m_creature->getVictim()))
             {
-                if(Phase == 1 && !Overpower_Timer)
+                if (Phase == 1 && !Overpower_Timer)
                 {
                     uint32 health = m_creature->getVictim()->GetHealth();
                     m_creature->AttackerStateUpdate(m_creature->getVictim());
-                    if(m_creature->getVictim() && health == m_creature->getVictim()->GetHealth())
+                    if (m_creature->getVictim() && health == m_creature->getVictim()->GetHealth())
                     {
                         m_creature->CastSpell(m_creature->getVictim(), SPELL_OVERPOWER, false);
                         Overpower_Timer = 5000;
@@ -290,7 +290,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
         for(uint8 i = 0; i < 4; ++i)
         {
             pCreature = m_creature->SummonCreature(SpiritInfo[i].entry, SpiritInfo[i].x, SpiritInfo[i].y, SpiritInfo[i].z, SpiritInfo[i].orient, TEMPSUMMON_DEAD_DESPAWN, 0);
-            if(pCreature)
+            if (pCreature)
             {
                 pCreature->CastSpell(pCreature, SPELL_SPIRIT_AURA, true);
                 pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -305,9 +305,9 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
         for(uint8 i = 0; i < 4; ++i)
         {
             Unit* Temp = NULL;
-            if(SpiritGUID[i])
+            if (SpiritGUID[i])
             {
-                if(Temp = Unit::GetUnit(*m_creature, SpiritGUID[i]))
+                if (Temp = Unit::GetUnit(*m_creature, SpiritGUID[i]))
                 {
                     Temp->SetVisibility(VISIBILITY_OFF);
                     Temp->setDeathState(DEAD);
@@ -344,21 +344,21 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
             DoCast(m_creature, Transform[Phase].spell);
             DoYell(Transform[Phase].text, LANG_UNIVERSAL, NULL);
             DoPlaySoundToSet(m_creature, Transform[Phase].sound);
-            if(Phase > 0)
+            if (Phase > 0)
             {
-                if(Unit *Temp = Unit::GetUnit(*m_creature, SpiritGUID[Phase - 1]))
+                if (Unit *Temp = Unit::GetUnit(*m_creature, SpiritGUID[Phase - 1]))
                     Temp->SetUInt32Value(UNIT_FIELD_BYTES_1,UNIT_STAND_STATE_DEAD);
             }
-            if(Unit *Temp = Unit::GetUnit(*m_creature, SpiritGUID[NextPhase - 1]))
+            if (Unit *Temp = Unit::GetUnit(*m_creature, SpiritGUID[NextPhase - 1]))
                 Temp->CastSpell(m_creature, SPELL_SIPHON_SOUL, false); // should m cast on temp
-            if(NextPhase == 2)
+            if (NextPhase == 2)
             {
                 m_creature->GetMotionMaster()->Clear();
                 m_creature->CastSpell(m_creature, SPELL_ENERGY_STORM, true); // enemy aura
                 for(uint8 i = 0; i < 4; ++i)
                 {
                     Creature* Vortex = DoSpawnCreature(CREATURE_FEATHER_VORTEX, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
-                    if(Vortex)
+                    if (Vortex)
                     {
                         Vortex->CastSpell(Vortex, SPELL_CYCLONE_PASSIVE, true);
                         Vortex->CastSpell(Vortex, SPELL_CYCLONE_VISUAL, true);
@@ -371,7 +371,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
             }
             else
                 m_creature->AI()->AttackStart(m_creature->getVictim());
-            if(NextPhase == 3)
+            if (NextPhase == 3)
             {
                 m_creature->RemoveAurasDueToSpell(SPELL_ENERGY_STORM);
                 Summons.DespawnEntry(CREATURE_FEATHER_VORTEX);
@@ -386,16 +386,16 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!TankGUID)
+        if (!TankGUID)
         {
-            if(!UpdateVictim())
+            if (!UpdateVictim())
                 return;
 
-            if(m_creature->GetHealth() < health_20 * (4 - Phase))
+            if (m_creature->GetHealth() < health_20 * (4 - Phase))
                 EnterPhase(Phase + 1);
         }
 
-        if(Berserk_Timer < diff)
+        if (Berserk_Timer < diff)
         {
             m_creature->CastSpell(m_creature, SPELL_BERSERK, true);
             DoYell(YELL_BERSERK, LANG_UNIVERSAL, NULL);
@@ -406,9 +406,9 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
         switch (Phase)
         {
         case 0:
-            if(Intro_Timer)
+            if (Intro_Timer)
             {
-                if(Intro_Timer <= diff)
+                if (Intro_Timer <= diff)
                 {
                     DoYell(YELL_AGGRO, LANG_UNIVERSAL, NULL);
                     DoPlaySoundToSet(m_creature, SOUND_AGGRO);
@@ -416,28 +416,28 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
                 }else Intro_Timer -= diff;
             }
 
-            if(Whirlwind_Timer < diff)
+            if (Whirlwind_Timer < diff)
             {
                 DoCast(m_creature, SPELL_WHIRLWIND);
                 Whirlwind_Timer = 15000 + rand()%5000;
             }else Whirlwind_Timer -= diff;
 
-            if(Grievous_Throw_Timer < diff)
+            if (Grievous_Throw_Timer < diff)
             {
-                if(Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                if (Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                     m_creature->CastSpell(target, SPELL_GRIEVOUS_THROW, false);
                 Grievous_Throw_Timer = 10000;
             }else Grievous_Throw_Timer -= diff;
             break;
 
         case 1:
-            if(Creeping_Paralysis_Timer < diff)
+            if (Creeping_Paralysis_Timer < diff)
             {
                 DoCast(m_creature, SPELL_CREEPING_PARALYSIS);
                 Creeping_Paralysis_Timer = 20000;
             }else Creeping_Paralysis_Timer -= diff;
 
-            if(Overpower_Timer < diff)
+            if (Overpower_Timer < diff)
             {
                 // implemented in DoMeleeAttackIfReady()
                 Overpower_Timer = 0;
@@ -448,11 +448,11 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
             return;
 
         case 3:
-            if(Claw_Rage_Timer <= diff)
+            if (Claw_Rage_Timer <= diff)
             {
-                if(!TankGUID)
+                if (!TankGUID)
                 {
-                    if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                    if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                     {
                         TankGUID = m_creature->getVictim()->GetGUID();
                         m_creature->SetSpeed(MOVE_RUN, 5.0f);
@@ -462,21 +462,21 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
                         Claw_Counter = 0;
                     }
                 }
-                else if(!Claw_Rage_Timer) // do not do this when Lynx_Rush
+                else if (!Claw_Rage_Timer) // do not do this when Lynx_Rush
                 {
-                    if(Claw_Loop_Timer < diff)
+                    if (Claw_Loop_Timer < diff)
                     {
                         Unit* target = m_creature->getVictim();
-                        if(!target || !target->isTargetableForAttack()) target = Unit::GetUnit(*m_creature, TankGUID);
-                        if(!target || !target->isTargetableForAttack()) target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                        if(target)
+                        if (!target || !target->isTargetableForAttack()) target = Unit::GetUnit(*m_creature, TankGUID);
+                        if (!target || !target->isTargetableForAttack()) target = SelectUnit(SELECT_TARGET_RANDOM, 0);
+                        if (target)
                         {
                             AttackStart(target);
-                            if(m_creature->IsWithinMeleeRange(target))
+                            if (m_creature->IsWithinMeleeRange(target))
                             {
                                 m_creature->CastSpell(target, SPELL_CLAW_RAGE_DAMAGE, true);
                                 Claw_Counter++;
-                                if(Claw_Counter == 12)
+                                if (Claw_Counter == 12)
                                 {
                                     Claw_Rage_Timer = 15000 + rand()%5000;
                                     m_creature->SetSpeed(MOVE_RUN, 1.2f);
@@ -490,18 +490,18 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
                         }
                         else
                         {
-                            EnterEvadeMode(); // if(target)
+                            EnterEvadeMode(); // if (target)
                             return;
                         }
                     }else Claw_Loop_Timer -= diff;
-                } //if(TankGUID)
+                } //if (TankGUID)
             }else Claw_Rage_Timer -= diff;
 
-            if(Lynx_Rush_Timer <= diff)
+            if (Lynx_Rush_Timer <= diff)
             {
-                if(!TankGUID)
+                if (!TankGUID)
                 {
-                    if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                    if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                     {
                         TankGUID = m_creature->getVictim()->GetGUID();
                         m_creature->SetSpeed(MOVE_RUN, 5.0f);
@@ -510,21 +510,21 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
                         Claw_Counter = 0;
                     }
                 }
-                else if(!Lynx_Rush_Timer)
+                else if (!Lynx_Rush_Timer)
                 {
                     Unit* target = m_creature->getVictim();
-                    if(!target || !target->isTargetableForAttack())
+                    if (!target || !target->isTargetableForAttack())
                     {
                         target = SelectUnit(SELECT_TARGET_RANDOM, 0);
                         AttackStart(target);
                     }
-                    if(target)
+                    if (target)
                     {
-                        if(m_creature->IsWithinMeleeRange(target))
+                        if (m_creature->IsWithinMeleeRange(target))
                         {
                             m_creature->CastSpell(target, SPELL_LYNX_RUSH_DAMAGE, true);
                             Claw_Counter++;
-                            if(Claw_Counter == 9)
+                            if (Claw_Counter == 9)
                             {
                                 Lynx_Rush_Timer = 15000 + rand()%5000;
                                 m_creature->SetSpeed(MOVE_RUN, 1.2f);
@@ -537,30 +537,30 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
                     }
                     else
                     {
-                        EnterEvadeMode(); // if(target)
+                        EnterEvadeMode(); // if (target)
                         return;
                     }
-                } //if(TankGUID)
+                } //if (TankGUID)
             }else Lynx_Rush_Timer -= diff;
 
             break;
         case 4:
-            if(Flame_Whirl_Timer < diff)
+            if (Flame_Whirl_Timer < diff)
             {
                 DoCast(m_creature, SPELL_FLAME_WHIRL);
                 Flame_Whirl_Timer = 12000;
             }Flame_Whirl_Timer -= diff;
 
-            if(Pillar_Of_Fire_Timer < diff)
+            if (Pillar_Of_Fire_Timer < diff)
             {
-                if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                     DoCast(target, SPELL_SUMMON_PILLAR);
                 Pillar_Of_Fire_Timer = 10000;
             }else Pillar_Of_Fire_Timer -= diff;
 
-            if(Flame_Breath_Timer < diff)
+            if (Flame_Breath_Timer < diff)
             {
-                if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
+                if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
                     m_creature->SetInFront(target);
                 DoCast(m_creature, SPELL_FLAME_BREATH);
                 Flame_Breath_Timer = 10000;
@@ -571,7 +571,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
             break;
         }
 
-        if(!TankGUID)
+        if (!TankGUID)
             DoMeleeAttackIfReady();
     }
 };
@@ -591,14 +591,14 @@ struct TRINITY_DLL_DECL feather_vortexAI : public ScriptedAI
 
     void SpellHit(Unit *caster, const SpellEntry *spell)
     {
-        if(spell->Id == SPELL_ZAP_INFORM)
+        if (spell->Id == SPELL_ZAP_INFORM)
             m_creature->CastSpell(caster, SPELL_ZAP_DAMAGE, true);
     }
 
     void UpdateAI(const uint32 diff)
     {
         //if the vortex reach the target, it change his target to another player
-        if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
+        if (m_creature->IsWithinMeleeRange(m_creature->getVictim()))
             AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
     }
 };
diff --git a/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp
index a781298da75..670120f2ab3 100644
--- a/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp
+++ b/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp
@@ -51,7 +51,7 @@ static SHostageInfo HostageInfo[] =
 
 struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
 {
-    instance_zulaman(Map *map) : ScriptedInstance(map) {Initialize();};
+    instance_zulaman(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
     uint64 HarkorsSatchelGUID;
     uint64 TanzarsTrunkGUID;
@@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i] == IN_PROGRESS) return true;
+            if (Encounters[i] == IN_PROGRESS) return true;
 
         return false;
     }
@@ -139,7 +139,7 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
 
     void SummonHostage(uint8 num)
     {
-        if(!QuestMinute)
+        if (!QuestMinute)
             return;
 
         Map::PlayerList const &PlayerList = instance->GetPlayers();
@@ -147,9 +147,9 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
             return;
 
         Map::PlayerList::const_iterator i = PlayerList.begin();
-        if(Player* i_pl = i->getSource())
+        if (Player* i_pl = i->getSource())
         {
-            if(Unit* Hostage = i_pl->SummonCreature(HostageInfo[num].npc, HostageInfo[num].x, HostageInfo[num].y, HostageInfo[num].z, HostageInfo[num].o, TEMPSUMMON_DEAD_DESPAWN, 0))
+            if (Unit* Hostage = i_pl->SummonCreature(HostageInfo[num].npc, HostageInfo[num].x, HostageInfo[num].y, HostageInfo[num].z, HostageInfo[num].o, TEMPSUMMON_DEAD_DESPAWN, 0))
             {
                 Hostage->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 Hostage->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@@ -159,10 +159,10 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
 
     void CheckInstanceStatus()
     {
-        if(BossKilled >= 4)
+        if (BossKilled >= 4)
             HandleGameObject(HexLordGateGUID, true);
 
-        if(BossKilled >= 5)
+        if (BossKilled >= 5)
             HandleGameObject(ZulJinGateGUID, true);
     }
 
@@ -185,14 +185,14 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
 
     void Load(const char* load)
     {
-        if(!load) return;
+        if (!load) return;
         std::istringstream ss(load);
         //error_log("TSCR: Zul'aman loaded, %s.", ss.str().c_str());
         char dataHead; // S
         uint16 data1, data2, data3;
         ss >> dataHead >> data1 >> data2 >> data3;
         //error_log("TSCR: Zul'aman loaded, %d %d %d.", data1, data2, data3);
-        if(dataHead == 'S')
+        if (dataHead == 'S')
         {
             BossKilled = data1;
             ChestLooted = data2;
@@ -206,9 +206,9 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
         {
         case DATA_NALORAKKEVENT:
             Encounters[0] = data;
-            if(data == DONE)
+            if (data == DONE)
             {
-                if(QuestMinute)
+                if (QuestMinute)
                 {
                     QuestMinute += 15;
                     UpdateWorldState(3106, QuestMinute);
@@ -219,9 +219,9 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
         case DATA_AKILZONEVENT:
             Encounters[1] = data;
             HandleGameObject(AkilzonDoorGUID, data != IN_PROGRESS);
-            if(data == DONE)
+            if (data == DONE)
             {
-                if(QuestMinute)
+                if (QuestMinute)
                 {
                     QuestMinute += 10;
                     UpdateWorldState(3106, QuestMinute);
@@ -231,18 +231,18 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
             break;
         case DATA_JANALAIEVENT:
             Encounters[2] = data;
-            if(data == DONE) SummonHostage(2);
+            if (data == DONE) SummonHostage(2);
             break;
         case DATA_HALAZZIEVENT:
             Encounters[3] = data;
             HandleGameObject(HalazziDoorGUID, data != IN_PROGRESS);
-            if(data == DONE) SummonHostage(3);
+            if (data == DONE) SummonHostage(3);
             break;
         case DATA_HEXLORDEVENT:
             Encounters[4] = data;
-            if(data == IN_PROGRESS)
+            if (data == IN_PROGRESS)
                 HandleGameObject(HexLordGateGUID, false);
-            else if(data == NOT_STARTED)
+            else if (data == NOT_STARTED)
                 CheckInstanceStatus();
             break;
         case DATA_ZULJINEVENT:
@@ -261,10 +261,10 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
             break;
         }
 
-        if(data == DONE)
+        if (data == DONE)
         {
             BossKilled++;
-            if(QuestMinute && BossKilled >= 4)
+            if (QuestMinute && BossKilled >= 4)
             {
                 QuestMinute = 0;
                 UpdateWorldState(3104, 0);
@@ -293,14 +293,14 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
 
     void Update(uint32 diff)
     {
-        if(QuestMinute)
+        if (QuestMinute)
         {
-            if(QuestTimer < diff)
+            if (QuestTimer < diff)
             {
                 QuestMinute--;
                 SaveToDB();
                 QuestTimer += 60000;
-                if(QuestMinute)
+                if (QuestMinute)
                 {
                     UpdateWorldState(3104, 1);
                     UpdateWorldState(3106, QuestMinute);
@@ -311,9 +311,9 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
     }
 };
 
-InstanceData* GetInstanceData_instance_zulaman(Map* map)
+InstanceData* GetInstanceData_instance_zulaman(Map* pMap)
 {
-    return new instance_zulaman(map);
+    return new instance_zulaman(pMap);
 }
 
 void AddSC_instance_zulaman()
diff --git a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp
index 1edb087e5c4..c128bc51073 100644
--- a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp
+++ b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp
@@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL npc_forest_frogAI : public ScriptedAI
 
     void DoSpawnRandom()
     {
-        if( pInstance )
+        if (pInstance)
         {
             uint32 cEntry = 0;
             switch(rand()%11)
@@ -69,24 +69,24 @@ struct TRINITY_DLL_DECL npc_forest_frogAI : public ScriptedAI
                 case 10: cEntry = 24455; break;         //Hollee
             }
 
-            if( !pInstance->GetData(TYPE_RAND_VENDOR_1) )
-                if(rand()%10 == 1) cEntry = 24408;      //Gunter
-            if( !pInstance->GetData(TYPE_RAND_VENDOR_2) )
-                if(rand()%10 == 1) cEntry = 24409;      //Kyren
+            if (!pInstance->GetData(TYPE_RAND_VENDOR_1))
+                if (rand()%10 == 1) cEntry = 24408;      //Gunter
+            if (!pInstance->GetData(TYPE_RAND_VENDOR_2))
+                if (rand()%10 == 1) cEntry = 24409;      //Kyren
 
-            if( cEntry ) m_creature->UpdateEntry(cEntry);
+            if (cEntry) m_creature->UpdateEntry(cEntry);
 
-            if( cEntry == 24408) pInstance->SetData(TYPE_RAND_VENDOR_1,DONE);
-            if( cEntry == 24409) pInstance->SetData(TYPE_RAND_VENDOR_2,DONE);
+            if (cEntry == 24408) pInstance->SetData(TYPE_RAND_VENDOR_1,DONE);
+            if (cEntry == 24409) pInstance->SetData(TYPE_RAND_VENDOR_2,DONE);
         }
     }
 
     void SpellHit(Unit *caster, const SpellEntry *spell)
     {
-        if( spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->GetTypeId() == TYPEID_PLAYER && m_creature->GetEntry() == ENTRY_FOREST_FROG )
+        if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->GetTypeId() == TYPEID_PLAYER && m_creature->GetEntry() == ENTRY_FOREST_FROG)
         {
             //increase or decrease chance of mojo?
-            if( rand()%99 == 50 ) DoCast(caster,SPELL_PUSH_MOJO,true);
+            if (rand()%99 == 50) DoCast(caster,SPELL_PUSH_MOJO,true);
             else DoSpawnRandom();
         }
     }
@@ -114,33 +114,33 @@ struct TRINITY_DLL_DECL npc_zulaman_hostageAI : public ScriptedAI
     void EnterCombat(Unit *who) {}
     void JustDied(Unit* who)
     {
-        Player* player = Unit::GetPlayer(PlayerGUID);
-        if(player) player->SendLoot(m_creature->GetGUID(), LOOT_CORPSE);
+        Player* pPlayer = Unit::GetPlayer(PlayerGUID);
+        if (pPlayer) pPlayer->SendLoot(m_creature->GetGUID(), LOOT_CORPSE);
     }
     void UpdateAI(const uint32 diff)
     {
-        if(IsLoot) m_creature->CastSpell(m_creature, 7, false);
+        if (IsLoot) m_creature->CastSpell(m_creature, 7, false);
     }
 };
 
-bool GossipHello_npc_zulaman_hostage(Player* player, Creature* _Creature)
+bool GossipHello_npc_zulaman_hostage(Player* pPlayer, Creature* _Creature)
 {
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HOSTAGE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-    player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HOSTAGE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+    pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
     return true;
 }
 
-bool GossipSelect_npc_zulaman_hostage(Player* player, Creature* _Creature, uint32 sender, uint32 action)
+bool GossipSelect_npc_zulaman_hostage(Player* pPlayer, Creature* _Creature, uint32 sender, uint32 action)
 {
-    if(action == GOSSIP_ACTION_INFO_DEF + 1)
-        player->CLOSE_GOSSIP_MENU();
+    if (action == GOSSIP_ACTION_INFO_DEF + 1)
+        pPlayer->CLOSE_GOSSIP_MENU();
 
-    if(!_Creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP))
+    if (!_Creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP))
         return true;
     _Creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
 
     ScriptedInstance* pInstance = (_Creature->GetInstanceData());
-    if(pInstance)
+    if (pInstance)
     {
         //uint8 progress = pInstance->GetData(DATA_CHESTLOOTED);
         pInstance->SetData(DATA_CHESTLOOTED, 0);
@@ -149,16 +149,16 @@ bool GossipSelect_npc_zulaman_hostage(Player* player, Creature* _Creature, uint3
         uint32 entry = _Creature->GetEntry();
         for(uint8 i = 0; i < 4; ++i)
         {
-            if(HostageEntry[i] == entry)
+            if (HostageEntry[i] == entry)
             {
                 _Creature->SummonGameObject(ChestEntry[i], x-2, y, z, 0, 0, 0, 0, 0, 0);
                 break;
             }
         }
         /*Creature* summon = _Creature->SummonCreature(HostageInfo[progress], x-2, y, z, 0, TEMPSUMMON_DEAD_DESPAWN, 0);
-        if(summon)
+        if (summon)
         {
-            CAST_AI(npc_zulaman_hostageAI, summon->AI())->PlayerGUID = player->GetGUID();
+            CAST_AI(npc_zulaman_hostageAI, summon->AI())->PlayerGUID = pPlayer->GetGUID();
             CAST_AI(npc_zulaman_hostageAI, summon->AI())->IsLoot = true;
             summon->SetDisplayId(10056);
             summon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
diff --git a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp
index 44589419ebd..7c082f12dc0 100644
--- a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp
+++ b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp
@@ -59,34 +59,34 @@ struct TRINITY_DLL_DECL npc_sergeant_blyAI : public ScriptedAI
 
         m_creature->setFaction(FACTION_FRIENDLY);
 
-        /*if( pInstance )
+        /*if (pInstance)
             pInstance->SetData(0, NOT_STARTED);*/
     }
 
     void EnterCombat(Unit *who)
     {
-        /*if( pInstance )
+        /*if (pInstance)
             pInstance->SetData(0, IN_PROGRESS);*/
     }
 
     void JustDied(Unit *victim)
     {
-        /*if( pInstance )
+        /*if (pInstance)
             pInstance->SetData(0, DONE);*/
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if( !UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
-        if( ShieldBash_Timer < diff )
+        if (ShieldBash_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_SHIELD_BASH);
             ShieldBash_Timer = 15000;
         }else ShieldBash_Timer -= diff;
 
-        if( Revenge_Timer < diff )
+        if (Revenge_Timer < diff)
         {
             DoCast(m_creature->getVictim(),SPELL_REVENGE);
             Revenge_Timer = 10000;
@@ -100,28 +100,28 @@ CreatureAI* GetAI_npc_sergeant_bly(Creature *_Creature)
     return new npc_sergeant_blyAI (_Creature);
 }
 
-bool GossipHello_npc_sergeant_bly(Player *player, Creature *_Creature )
+bool GossipHello_npc_sergeant_bly(Player* pPlayer, Creature *_Creature)
 {
-    /*if( pInstance->GetData(0) == DONE )
+    /*if (pInstance->GetData(0) == DONE)
     {*/
-    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-    player->SEND_GOSSIP_MENU(1517, _Creature->GetGUID());
+    pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+    pPlayer->SEND_GOSSIP_MENU(1517, _Creature->GetGUID());
     /*}
-    else if( pInstance->GetData(0) == IN_PROGRESS )
-        player->SEND_GOSSIP_MENU(1516, _Creature->GetGUID());
+    else if (pInstance->GetData(0) == IN_PROGRESS)
+        pPlayer->SEND_GOSSIP_MENU(1516, _Creature->GetGUID());
     else
-        player->SEND_GOSSIP_MENU(1515, _Creature->GetGUID());*/
+        pPlayer->SEND_GOSSIP_MENU(1515, _Creature->GetGUID());*/
 
     return true;
 }
 
-bool GossipSelect_npc_sergeant_bly(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_sergeant_bly(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_INFO_DEF+1 )
+    if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->CLOSE_GOSSIP_MENU();
+        pPlayer->CLOSE_GOSSIP_MENU();
         _Creature->setFaction(FACTION_HOSTILE);
-        CAST_AI(npc_sergeant_blyAI, _Creature->AI())->AttackStart(player);
+        CAST_AI(npc_sergeant_blyAI, _Creature->AI())->AttackStart(pPlayer);
     }
     return true;
 }
@@ -148,25 +148,25 @@ struct TRINITY_DLL_DECL npc_weegli_blastfuseAI : public ScriptedAI
 
     void Reset()
     {
-        /*if( pInstance )
+        /*if (pInstance)
             pInstance->SetData(0, NOT_STARTED);*/
     }
 
     void EnterCombat(Unit *who)
     {
-        /*if( pInstance )
+        /*if (pInstance)
             pInstance->SetData(0, IN_PROGRESS);*/
     }
 
     void JustDied(Unit *victim)
     {
-        /*if( pInstance )
+        /*if (pInstance)
             pInstance->SetData(0, DONE);*/
     }
 
     void UpdateAI(const uint32 diff)
     {
-        if( !UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();
@@ -177,26 +177,26 @@ CreatureAI* GetAI_npc_weegli_blastfuse(Creature *_Creature)
     return new npc_weegli_blastfuseAI (_Creature);
 }
 
-bool GossipHello_npc_weegli_blastfuse(Player *player, Creature *_Creature )
+bool GossipHello_npc_weegli_blastfuse(Player* pPlayer, Creature *_Creature)
 {
     //event not implemented yet, this is only placeholder for future developement
-    /*if( pInstance->GetData(0) == DONE )
+    /*if (pInstance->GetData(0) == DONE)
     {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEEGLI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->SEND_GOSSIP_MENU(1514, _Creature->GetGUID());//if event can proceed to end
+        pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_WEEGLI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        pPlayer->SEND_GOSSIP_MENU(1514, _Creature->GetGUID());//if event can proceed to end
     }
-    else if( pInstance->GetData(0) == IN_PROGRESS )
-        player->SEND_GOSSIP_MENU(1513, _Creature->GetGUID());//if event are in progress
+    else if (pInstance->GetData(0) == IN_PROGRESS)
+        pPlayer->SEND_GOSSIP_MENU(1513, _Creature->GetGUID());//if event are in progress
     else*/
-    player->SEND_GOSSIP_MENU(1511, _Creature->GetGUID());   //if event not started
+    pPlayer->SEND_GOSSIP_MENU(1511, _Creature->GetGUID());   //if event not started
     return true;
 }
 
-bool GossipSelect_npc_weegli_blastfuse(Player *player, Creature *_Creature, uint32 sender, uint32 action )
+bool GossipSelect_npc_weegli_blastfuse(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
 {
-    if( action == GOSSIP_ACTION_INFO_DEF+1 )
+    if (action == GOSSIP_ACTION_INFO_DEF+1)
     {
-        player->CLOSE_GOSSIP_MENU();
+        pPlayer->CLOSE_GOSSIP_MENU();
         //here we make him run to door, set the charge and run away off to nowhere
     }
     return true;
diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp
index c961b851d2d..3358255e0bc 100644
--- a/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp
+++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_arlokk.cpp
@@ -122,7 +122,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI
         m_creature->SetDisplayId(MODEL_ID_NORMAL);
         m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
 
-        if(m_pInstance)
+        if (m_pInstance)
             m_pInstance->SetData(TYPE_ARLOKK, DONE);
     }
 
@@ -227,7 +227,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI
 
         if (m_bIsVanished)
         {
-            if(m_uiVisible_Timer < uiDiff)
+            if (m_uiVisible_Timer < uiDiff)
             {
                 //The Panther Model
                 m_creature->SetDisplayId(MODEL_ID_PANTHER);
@@ -238,7 +238,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI
                 m_creature->SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, (cinfo->maxdmg +((cinfo->maxdmg/100) * 35)));
                 m_creature->UpdateDamagePhysical(BASE_ATTACK);
 
-                if(Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
+                if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
                     AttackStart(pTarget);
 
                 m_bIsPhaseTwo = true;
diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp
index 6a7455e731e..ec865707e00 100644
--- a/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp
+++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_grilek.cpp
@@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL boss_grilekAI : public ScriptedAI
 
             target = SelectUnit(SELECT_TARGET_RANDOM,1);
 
-            if(DoGetThreat(m_creature->getVictim()))
+            if (DoGetThreat(m_creature->getVictim()))
                 DoModifyThreatPercent(m_creature->getVictim(),-50);
             if (target)
                 AttackStart(target);
diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp
index 332671939ad..789e7cc2f97 100644
--- a/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp
+++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp
@@ -75,11 +75,11 @@ struct TRINITY_DLL_DECL boss_hazzarahAI : public ScriptedAI
             for(uint8 i = 0; i < 3; ++i)
             {
                 target = SelectUnit(SELECT_TARGET_RANDOM,0);
-                if(!target)
+                if (!target)
                     return;
 
                 Illusion = m_creature->SummonCreature(15163,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,30000);
-                if(Illusion)
+                if (Illusion)
                     (Illusion->AI())->AttackStart(target);
             }
 
diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp
index da1cffea32d..23ba0102e72 100644
--- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp
+++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jeklik.cpp
@@ -129,21 +129,21 @@ struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI
 
                     Creature* Bat = NULL;
                     Bat = m_creature->SummonCreature(11368,-12291.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                    if (target && Bat ) Bat ->AI()->AttackStart(target);
+                    if (target && Bat) Bat ->AI()->AttackStart(target);
 
                     Bat = m_creature->SummonCreature(11368,-12289.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                    if (target && Bat ) Bat ->AI()->AttackStart(target);
+                    if (target && Bat) Bat ->AI()->AttackStart(target);
 
                     Bat = m_creature->SummonCreature(11368,-12293.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                    if (target && Bat ) Bat ->AI()->AttackStart(target);
+                    if (target && Bat) Bat ->AI()->AttackStart(target);
 
                     Bat = m_creature->SummonCreature(11368,-12291.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                    if (target && Bat ) Bat ->AI()->AttackStart(target);
+                    if (target && Bat) Bat ->AI()->AttackStart(target);
 
                     Bat = m_creature->SummonCreature(11368,-12289.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                    if (target && Bat ) Bat ->AI()->AttackStart(target);
+                    if (target && Bat) Bat ->AI()->AttackStart(target);
                     Bat = m_creature->SummonCreature(11368,-12293.6220,-1380.2640,144.8304,5.483, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                    if (target && Bat ) Bat ->AI()->AttackStart(target);
+                    if (target && Bat) Bat ->AI()->AttackStart(target);
 
                     SpawnBats_Timer = 60000;
                 }else SpawnBats_Timer -= diff;
@@ -232,7 +232,7 @@ struct TRINITY_DLL_DECL mob_batriderAI : public ScriptedAI
 
     void UpdateAI (const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Bomb_Timer
diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp
index 279ec81b3eb..aa287e1b263 100644
--- a/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp
+++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_jindo.cpp
@@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL boss_jindoAI : public ScriptedAI
         {
             DoCast(m_creature->getVictim(), SPELL_HEX);
 
-            if(DoGetThreat(m_creature->getVictim()))
+            if (DoGetThreat(m_creature->getVictim()))
                 DoModifyThreatPercent(m_creature->getVictim(),-80);
 
             Hex_Timer = 12000 + rand()%8000;
@@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL boss_jindoAI : public ScriptedAI
                 DoCast(target, SPELL_DELUSIONSOFJINDO);
 
                 Creature *Shade = m_creature->SummonCreature(14986, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Shade)
+                if (Shade)
                     Shade->AI()->AttackStart(target);
             }
 
@@ -123,36 +123,36 @@ struct TRINITY_DLL_DECL boss_jindoAI : public ScriptedAI
             {
                 DoTeleportPlayer(target, -11583.7783,-1249.4278,77.5471,4.745);
 
-                if(DoGetThreat(m_creature->getVictim()))
+                if (DoGetThreat(m_creature->getVictim()))
                     DoModifyThreatPercent(target,-100);
 
                 Creature *Skeletons;
                 Skeletons = m_creature->SummonCreature(14826, target->GetPositionX()+2, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Skeletons)
+                if (Skeletons)
                     Skeletons->AI()->AttackStart(target);
                 Skeletons = m_creature->SummonCreature(14826, target->GetPositionX()-2, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Skeletons)
+                if (Skeletons)
                     Skeletons->AI()->AttackStart(target);
                 Skeletons = m_creature->SummonCreature(14826, target->GetPositionX()+4, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Skeletons)
+                if (Skeletons)
                     Skeletons->AI()->AttackStart(target);
                 Skeletons = m_creature->SummonCreature(14826, target->GetPositionX()-4, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Skeletons)
+                if (Skeletons)
                     Skeletons->AI()->AttackStart(target);
                 Skeletons = m_creature->SummonCreature(14826, target->GetPositionX(), target->GetPositionY()+2, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Skeletons)
+                if (Skeletons)
                     Skeletons->AI()->AttackStart(target);
                 Skeletons = m_creature->SummonCreature(14826, target->GetPositionX(), target->GetPositionY()-2, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Skeletons)
+                if (Skeletons)
                     Skeletons->AI()->AttackStart(target);
                 Skeletons = m_creature->SummonCreature(14826, target->GetPositionX(), target->GetPositionY()+4, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Skeletons)
+                if (Skeletons)
                     Skeletons->AI()->AttackStart(target);
                 Skeletons = m_creature->SummonCreature(14826, target->GetPositionX(), target->GetPositionY()-4, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Skeletons)
+                if (Skeletons)
                     Skeletons->AI()->AttackStart(target);
                 Skeletons = m_creature->SummonCreature(14826, target->GetPositionX()+3, target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Skeletons)
+                if (Skeletons)
                     Skeletons->AI()->AttackStart(target);
             }
 
@@ -187,12 +187,12 @@ struct TRINITY_DLL_DECL mob_healing_wardAI : public ScriptedAI
     void UpdateAI (const uint32 diff)
     {
         //Heal_Timer
-        if(Heal_Timer < diff)
+        if (Heal_Timer < diff)
         {
-            if(pInstance)
+            if (pInstance)
             {
                 Unit *pJindo = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_JINDO));
-                if(pJindo)
+                if (pJindo)
                     DoCast(pJindo, SPELL_HEAL);
             }
             Heal_Timer = 3000;
@@ -228,7 +228,7 @@ struct TRINITY_DLL_DECL mob_shade_of_jindoAI : public ScriptedAI
     {
 
         //ShadowShock_Timer
-        if(ShadowShock_Timer < diff)
+        if (ShadowShock_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_SHADOWSHOCK);
             ShadowShock_Timer = 2000;
diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp
index f5bd8fa9958..dc3ed1669a6 100644
--- a/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp
+++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_mandokir.cpp
@@ -133,7 +133,7 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if ( m_creature->getVictim() && m_creature->isAlive())
+        if (m_creature->getVictim() && m_creature->isAlive())
         {
             if (!CombatStart)
             {
@@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI
                 {
                     Unit* pUnit = Unit::GetUnit(*m_creature, WatchTarget);
 
-                    if ( pUnit && (
+                    if (pUnit && (
                         targetX != pUnit->GetPositionX() ||
                         targetY != pUnit->GetPositionY() ||
                         targetZ != pUnit->GetPositionZ() ||
@@ -292,7 +292,7 @@ struct TRINITY_DLL_DECL mob_ohganAI : public ScriptedAI
     void UpdateAI (const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //SunderArmor_Timer
diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp
index 79fb6f9653d..ccad5b47dd7 100644
--- a/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp
+++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_marli.cpp
@@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI
     void JustDied(Unit* Killer)
     {
         DoScriptText(SAY_DEATH, m_creature);
-        if(m_pInstance)
+        if (m_pInstance)
             m_pInstance->SetData(TYPE_MARLI, DONE);
     }
 
@@ -90,7 +90,7 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-        if( m_creature->getVictim() && m_creature->isAlive())
+        if (m_creature->getVictim() && m_creature->isAlive())
         {
             if (PoisonVolley_Timer < diff)
             {
@@ -109,20 +109,20 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI
                 DoScriptText(SAY_SPIDER_SPAWN, m_creature);
 
                 Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0);
-                if(!target)
+                if (!target)
                     return;
 
                 Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Spider)
+                if (Spider)
                     Spider->AI()->AttackStart(target);
                 Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Spider)
+                if (Spider)
                     Spider->AI()->AttackStart(target);
                 Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Spider)
+                if (Spider)
                     Spider->AI()->AttackStart(target);
                 Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Spider)
+                if (Spider)
                     Spider->AI()->AttackStart(target);
 
                 Spawned = true;
@@ -131,16 +131,16 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI
             if (SpawnSpider_Timer < diff)
             {
                 Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0);
-                if(!target)
+                if (!target)
                     return;
 
                 Spider = m_creature->SummonCreature(15041,target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                if(Spider)
+                if (Spider)
                     Spider->AI()->AttackStart(target);
                 SpawnSpider_Timer = 12000 + rand()%5000;
             }else SpawnSpider_Timer -= diff;
 
-            if(!PhaseTwo && Transform_Timer < diff)
+            if (!PhaseTwo && Transform_Timer < diff)
             {
                 DoScriptText(SAY_TRANSFORM, m_creature);
                 DoCast(m_creature,SPELL_SPIDER_FORM);
@@ -150,7 +150,7 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI
                 m_creature->UpdateDamagePhysical(BASE_ATTACK);
                 DoCast(m_creature->getVictim(),SPELL_ENVOLWINGWEB);
 
-                if(DoGetThreat(m_creature->getVictim()))
+                if (DoGetThreat(m_creature->getVictim()))
                     DoModifyThreatPercent(m_creature->getVictim(),-100);
 
                 PhaseTwo = true;
@@ -220,11 +220,11 @@ struct TRINITY_DLL_DECL mob_spawn_of_marliAI : public ScriptedAI
     void UpdateAI (const uint32 diff)
     {
         //Return since we have no target
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //LevelUp_Timer
-        if(LevelUp_Timer < diff)
+        if (LevelUp_Timer < diff)
         {
             DoCast(m_creature,SPELL_LEVELUP);
             LevelUp_Timer = 3000;
diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp
index 54cda57d9f9..61f7c58bcf2 100644
--- a/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp
+++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_renataki.cpp
@@ -111,13 +111,13 @@ struct TRINITY_DLL_DECL boss_renatakiAI : public ScriptedAI
         }
 
         //Resetting some aggro so he attacks other gamers
-        if(!Invisible)
+        if (!Invisible)
             if (Aggro_Timer < diff)
         {
             Unit* target = NULL;
             target = SelectUnit(SELECT_TARGET_RANDOM,1);
 
-            if(DoGetThreat(m_creature->getVictim()))
+            if (DoGetThreat(m_creature->getVictim()))
                 DoModifyThreatPercent(m_creature->getVictim(),-50);
 
             if (target)
@@ -127,7 +127,7 @@ struct TRINITY_DLL_DECL boss_renatakiAI : public ScriptedAI
         }else Aggro_Timer -= diff;
 
         if (!Invisible)
-            if(ThousandBlades_Timer < diff)
+            if (ThousandBlades_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_THOUSANDBLADES);
             ThousandBlades_Timer = 7000 + rand()%5000;
diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp
index eb5d3d65114..68219ae11bc 100644
--- a/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp
+++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_thekal.cpp
@@ -283,7 +283,7 @@ struct TRINITY_DLL_DECL mob_zealot_lorkhanAI : public ScriptedAI
 
     void UpdateAI (const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //Shield_Timer
@@ -427,7 +427,7 @@ struct TRINITY_DLL_DECL mob_zealot_zathAI : public ScriptedAI
 
     void UpdateAI (const uint32 diff)
     {
-        if (!UpdateVictim() )
+        if (!UpdateVictim())
             return;
 
         //SweepingStrikes_Timer
diff --git a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp
index 68ca33b91b2..366cc7b982c 100644
--- a/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp
+++ b/src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp
@@ -80,7 +80,7 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI
     void JustDied(Unit* Killer)
     {
         DoScriptText(SAY_DEATH, m_creature);
-        if(m_pInstance)
+        if (m_pInstance)
             m_pInstance->SetData(TYPE_VENOXIS, DONE);
     }
 
@@ -115,11 +115,11 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI
                     for(uint8 i=0; i<10; ++i)
                     {
                         if (Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO,i))
-                            if(m_creature->IsWithinMeleeRange(target))
+                            if (m_creature->IsWithinMeleeRange(target))
                                 TargetInRange++;
                     }
 
-                    if(TargetInRange > 1)
+                    if (TargetInRange > 1)
                     {
                         DoCast(m_creature->getVictim(),SPELL_HOLY_NOVA);
                         HolyNova_Timer = 1000;
@@ -141,7 +141,7 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI
             }
             else
             {
-                if(!PhaseTwo)
+                if (!PhaseTwo)
                 {
                     DoScriptText(SAY_TRANSFORM, m_creature);
                     m_creature->InterruptNonMeleeSpells(false);
@@ -155,7 +155,7 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI
                     PhaseTwo = true;
                 }
 
-                if(PhaseTwo && PoisonCloud_Timer < diff)
+                if (PhaseTwo && PoisonCloud_Timer < diff)
                 {
                     DoCast(m_creature->getVictim(), SPELL_POISON_CLOUD);
                     PoisonCloud_Timer = 15000;