*Massive cleanup redux.

--HG--
branch : trunk

202 files changed, 491 insertions, 625 deletions

diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index 0b48f5f7cef..184102a2036 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -70,7 +70,7 @@ void ScriptsFree()
     delete []SpellSummary;
 
     // Free resources before library unload
-    for(uint16 i =0;i<MAX_SCRIPTS;++i)
+    for (uint16 i =0; i<MAX_SCRIPTS; ++i)
         delete m_scripts[i];
 
     num_sc_scripts = 0;
@@ -105,7 +105,7 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
     bar.step();
     outstring_log("");
 
-    for(uint16 i =0;i<MAX_SCRIPTS;++i)
+    for (uint16 i =0; i<MAX_SCRIPTS; ++i)
         m_scripts[i]=NULL;
 
     FillSpellSummary();
diff --git a/src/bindings/scripts/base/escort_ai.cpp b/src/bindings/scripts/base/escort_ai.cpp
index 4d6083ab470..21f56eb99f4 100644
--- a/src/bindings/scripts/base/escort_ai.cpp
+++ b/src/bindings/scripts/base/escort_ai.cpp
@@ -127,7 +127,7 @@ void npc_escortAI::JustDied(Unit* pKiller)
     {
         if (Group* pGroup = pPlayer->GetGroup())
         {
-            for(GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+            for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
             {
                 if (Player* pMember = pRef->getSource())
                 {
@@ -192,7 +192,7 @@ bool npc_escortAI::IsPlayerOrGroupInRange()
     {
         if (Group* pGroup = pPlayer->GetGroup())
         {
-            for(GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+            for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
             {
                 Player* pMember = pRef->getSource();
 
diff --git a/src/bindings/scripts/base/follower_ai.cpp b/src/bindings/scripts/base/follower_ai.cpp
index 8284af7aec0..1b938d0e855 100644
--- a/src/bindings/scripts/base/follower_ai.cpp
+++ b/src/bindings/scripts/base/follower_ai.cpp
@@ -125,7 +125,7 @@ void FollowerAI::JustDied(Unit* pKiller)
     {
         if (Group* pGroup = pPlayer->GetGroup())
         {
-            for(GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+            for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
             {
                 if (Player* pMember = pRef->getSource())
                 {
@@ -210,7 +210,7 @@ void FollowerAI::UpdateAI(const uint32 uiDiff)
 
                 if (Group* pGroup = pPlayer->GetGroup())
                 {
-                    for(GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+                    for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
                     {
                         Player* pMember = pRef->getSource();
 
@@ -317,7 +317,7 @@ Player* FollowerAI::GetLeaderForFollower()
         {
             if (Group* pGroup = pLeader->GetGroup())
             {
-                for(GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
+                for (GroupReference* pRef = pGroup->GetFirstMember(); pRef != NULL; pRef = pRef->next())
                 {
                     Player* pMember = pRef->getSource();
 
diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp
index 21c8842fb44..f11af7fea33 100644
--- a/src/bindings/scripts/include/sc_creature.cpp
+++ b/src/bindings/scripts/include/sc_creature.cpp
@@ -20,7 +20,7 @@ struct TSpellSummary
 
 void SummonList::DoZoneInCombat(uint32 entry)
 {
-    for(iterator i = begin(); i != end();)
+    for (iterator i = begin(); i != end(); )
     {
         Creature *summon = Unit::GetCreature(*m_creature, *i);
         ++i;
@@ -32,7 +32,7 @@ void SummonList::DoZoneInCombat(uint32 entry)
 
 void SummonList::DoAction(uint32 entry, uint32 info)
 {
-    for(iterator i = begin(); i != end();)
+    for (iterator i = begin(); i != end(); )
     {
         Creature *summon = Unit::GetCreature(*m_creature, *i);
         ++i;
@@ -44,7 +44,7 @@ void SummonList::DoAction(uint32 entry, uint32 info)
 
 void SummonList::DespawnEntry(uint32 entry)
 {
-    for(iterator i = begin(); i != end();)
+    for (iterator i = begin(); i != end(); )
     {
         Creature *summon = Unit::GetCreature(*m_creature, *i);
         if(!summon)
@@ -313,7 +313,7 @@ void FillSpellSummary()
 
     SpellEntry const* pTempSpell;
 
-    for(uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
+    for (uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
     {
         SpellSummary[i].Effects = 0;
         SpellSummary[i].Targets = 0;
@@ -323,7 +323,7 @@ void FillSpellSummary()
         if (!pTempSpell)
             continue;
 
-        for(uint32 j = 0; j < 3; ++j)
+        for (uint32 j = 0; j < 3; ++j)
         {
             //Spell targets self
             if (pTempSpell->EffectImplicitTargetA[j] == TARGET_UNIT_CASTER )
@@ -402,7 +402,7 @@ void ScriptedAI::DoResetThreat()
 
     std::list<HostilReference*>& threatlist = m_creature->getThreatManager().getThreatList();
 
-    for(std::list<HostilReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
+    for (std::list<HostilReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
     {
         Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid());
 
@@ -453,7 +453,7 @@ void ScriptedAI::DoTeleportAll(float fX, float fY, float fZ, float fO)
         return;
 
     Map::PlayerList const &PlayerList = map->GetPlayers();
-    for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+    for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
         if (Player* i_pl = i->getSource())
             if (i_pl->isAlive())
                 i_pl->TeleportTo(m_creature->GetMapId(), fX, fY, fZ, fO, TELE_TO_NOT_LEAVE_COMBAT);
@@ -634,7 +634,7 @@ void BossAI::TeleportCheaters()
     float x, y, z;
     me->GetPosition(x, y, z);
     std::list<HostilReference*> &m_threatlist = me->getThreatManager().getThreatList();
-    for(std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr)
+    for (std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr)
         if((*itr)->getTarget()->GetTypeId() == TYPEID_PLAYER && !CheckBoundary((*itr)->getTarget()))
             (*itr)->getTarget()->NearTeleportTo(x, y, z, 0);
 }
@@ -644,7 +644,7 @@ bool BossAI::CheckBoundary(Unit *who)
     if(!boundary || !who)
         return true;
 
-    for(BossBoundaryMap::const_iterator itr = boundary->begin(); itr != boundary->end(); ++itr)
+    for (BossBoundaryMap::const_iterator itr = boundary->begin(); itr != boundary->end(); ++itr)
     {
         switch(itr->first)
         {
@@ -718,7 +718,7 @@ void LoadOverridenSQLData()
 void LoadOverridenDBCData()
 {
     SpellEntry *spellInfo;
-    for(uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
+    for (uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
     {
         spellInfo = GET_SPELL(i);
         if(!spellInfo)
@@ -749,7 +749,6 @@ void LoadOverridenDBCData()
     }
 }
 
-
 Creature* GetClosestCreatureWithEntry(WorldObject* pSource, uint32 Entry, float MaxSearchRange)
 {
     Creature* pCreature = NULL;
diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h
index 91073bf4032..32015dbb340 100644
--- a/src/bindings/scripts/include/sc_creature.h
+++ b/src/bindings/scripts/include/sc_creature.h
@@ -180,7 +180,6 @@ struct TRINITY_DLL_DECL Scripted_NoMovementAI : public ScriptedAI
 {
     Scripted_NoMovementAI(Creature* creature) : ScriptedAI(creature) {}
 
-
     //Called at each attack of m_creature by any victim
     void AttackStart(Unit* who);
 };
diff --git a/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp b/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp
index 1f25d15205d..b74de7e2358 100644
--- a/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp
+++ b/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp
@@ -26,7 +26,6 @@ bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature* pCre
         pPlayer->GetSession()->SendDoFlight(6376, 881);
     }
 
-
     if (uiAction == GOSSIP_ACTION_INFO_DEF + 2)
     {
       pPlayer->GetSession()->SendDoFlight(6376, 882);
@@ -46,8 +45,6 @@ pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MIDDLE, GOSSIP_SENDER_MAIN, GO
     return true;
 }
 
-
-
 bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
 {
     if (uiAction == GOSSIP_ACTION_INFO_DEF + 4)
@@ -55,7 +52,6 @@ bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature* pCre
         pPlayer->GetSession()->SendDoFlight(6376, 878);
     }
 
-
     if (uiAction == GOSSIP_ACTION_INFO_DEF + 3)
     {
       pPlayer->GetSession()->SendDoFlight(6376, 883);
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
index a7bb66ac9cf..94f40eee090 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
@@ -148,7 +148,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI
         MobCount = 0;
         MobDeath_Timer = 0;
 
-        for(uint8 i = 0; i < MAX_MOB_AMOUNT; ++i)
+        for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i)
             RingMobGUID[i] = 0;
 
         RingBossGUID = 0;
@@ -241,7 +241,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI
                     return;
                 }
 
-                for(uint8 i = 0; i < MAX_MOB_AMOUNT; ++i)
+                for (uint8 i = 0; i < MAX_MOB_AMOUNT; ++i)
                 {
                     Creature *mob = Unit::GetCreature(*m_creature,RingMobGUID[i]);
                     if (mob && !mob->isAlive() && mob->isDead())
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
index f14b7603fa7..79ef098260d 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
@@ -138,7 +138,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
         TombTimer = TIMER_TOMBOFTHESEVEN;
         TombEventCounter = 0;
 
-        for(uint8 i = 0; i < 7; ++i)
+        for (uint8 i = 0; i < 7; ++i)
             TombBossGUIDs[i] = 0;
     }
 
@@ -324,7 +324,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
         loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
         >> m_auiEncounter[4] >> m_auiEncounter[5] >> GhostKillCount;
 
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS)
                 m_auiEncounter[i] = NOT_STARTED;
         if (GhostKillCount > 0 && GhostKillCount < 7)
@@ -353,7 +353,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
     {
         HandleGameObject(GoTombExitGUID,false);//event reseted, close exit door
         HandleGameObject(GoTombEnterGUID,true);//event reseted, open entrance door
-        for(uint8 i = 0; i < 7; ++i)
+        for (uint8 i = 0; i < 7; ++i)
         {
             if (Creature* boss = instance->GetCreature(TombBossGUIDs[i]))
             {
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp
index b36b4afe7b1..23dcdd0e91c 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp
@@ -247,7 +247,7 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI
 
             std::list<HostilReference*>::iterator i;
 
-            for (i = m_creature->getThreatManager().getThreatList().begin();i != m_creature->getThreatManager().getThreatList().end();)
+            for (i = m_creature->getThreatManager().getThreatList().begin(); i != m_creature->getThreatManager().getThreatList().end(); )
             {
                 Unit* pUnit = NULL;
                 pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp
index b3d598c7669..7914c87fe1a 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp
@@ -182,7 +182,6 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI
     uint32 timerJudLight;
     uint32 timerCommand;
 
-
     void Reset() {
 
       timer = 2000;
@@ -388,7 +387,6 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI
     void SummonedCreatureDespawn(Creature* c) {}
 };
 
-
 bool GossipHello_master_kelerun_bloodmourn(Player* pPlayer, Creature* pCreature)
 {
     // quest only available if not already started
@@ -442,7 +440,7 @@ void npc_secondTrialAI::JustDied(Unit* Killer) {
 
             if (Group *pGroup = CAST_PLR(Killer)->GetGroup())
             {
-               for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+               for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
                {
                  Player *pGroupGuy = itr->getSource();
 
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp
index 2a4bf67868b..28adee2f787 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/hinterlands.cpp
@@ -79,7 +79,7 @@ struct MANGOS_DLL_DECL npc_00x09hlAI : public npc_escortAI
         switch(uiPointId)
         {
             case 27:
-                for(uint8 i = 0; i < 3; ++i)
+                for (uint8 i = 0; i < 3; ++i)
                 {
                     const Position src = {147.927444f, -3851.513428f, 130.893f, 0};
                     Position pos;
@@ -88,7 +88,7 @@ struct MANGOS_DLL_DECL npc_00x09hlAI : public npc_escortAI
                 }
                 break;
             case 44:
-                for(uint8 i = 0; i < 3; ++i)
+                for (uint8 i = 0; i < 3; ++i)
                 {
                     const Position src = {-141.151581f, -4291.213867f, 120.130f, 0};
                     Position dst;
@@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL npc_rinjiAI : public npc_escortAI
             m_afAmbushSpawn[m_iSpawnId].m_fX, m_afAmbushSpawn[m_iSpawnId].m_fY, m_afAmbushSpawn[m_iSpawnId].m_fZ, 0.0f,
             TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
 
-        for(int i = 0; i < 2; ++i)
+        for (int i = 0; i < 2; ++i)
         {
             m_creature->SummonCreature(NPC_OUTRUNNER,
                 m_afAmbushSpawn[m_iSpawnId].m_fX, m_afAmbushSpawn[m_iSpawnId].m_fY, m_afAmbushSpawn[m_iSpawnId].m_fZ, 0.0f,
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
index 57a0a1c1c5b..1bb954b51f9 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
@@ -246,7 +246,7 @@ struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI
                 Unit *target;
                 std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
                 std::vector<Unit *> target_list;
-                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)
                 {
                     target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
                     if (target && !target->IsWithinDist(m_creature, ATTACK_DISTANCE, false))
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
index 2714b95f3c4..c2ab4a9567b 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
@@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
 {
     boss_moroesAI(Creature *c) : ScriptedAI(c)
     {
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             AddId[i] = 0;
         }
@@ -158,15 +158,14 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
             Creature *pCreature = NULL;
             std::vector<uint32> AddList;
 
-
-            for(uint8 i = 0; i < 6; ++i)
+            for (uint8 i = 0; i < 6; ++i)
                 AddList.push_back(Adds[i]);
 
             while(AddList.size() > 4)
                 AddList.erase((AddList.begin())+(rand()%AddList.size()));
 
             uint8 i = 0;
-            for(std::vector<uint32>::iterator itr = AddList.begin(); itr != AddList.end(); ++itr)
+            for (std::vector<uint32>::iterator itr = AddList.begin(); itr != AddList.end(); ++itr)
             {
                 uint32 entry = *itr;
 
@@ -180,7 +179,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
             }
         }else
         {
-            for(uint8 i = 0; i < 4; ++i)
+            for (uint8 i = 0; i < 4; ++i)
             {
                 Creature *pCreature = m_creature->SummonCreature(AddId[i], Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
                 if (pCreature)
@@ -193,7 +192,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
 
     bool isAddlistEmpty()
     {
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             if (AddId[i] == 0)
                 return true;
@@ -203,7 +202,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
 
     void DeSpawnAdds()
     {
-        for(uint8 i = 0; i < 4 ; ++i)
+        for (uint8 i = 0; i < 4 ; ++i)
         {
             Creature* Temp = NULL;
             if (AddGUID[i])
@@ -217,7 +216,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
 
     void AddsAttack()
     {
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             Creature* Temp = NULL;
             if (AddGUID[i])
@@ -323,7 +322,7 @@ struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI
 
     boss_moroes_guestAI(Creature* c) : ScriptedAI(c)
     {
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
             GuestGUID[i] = 0;
 
         pInstance = c->GetInstanceData();
@@ -344,7 +343,7 @@ struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI
         Creature* Moroes = (Unit::GetCreature((*m_creature), GuestGUID[0]));
         if (Moroes)
         {
-            for(uint8 i = 0; i < 3; ++i)
+            for (uint8 i = 0; i < 3; ++i)
             {
                 uint64 GUID = CAST_AI(boss_moroesAI, Moroes->AI())->AddGUID[i];
                 if (GUID && GUID != m_creature->GetGUID())
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
index b6e3d25c021..4776042cdb0 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
@@ -62,14 +62,14 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
     {
         pInstance = c->GetInstanceData();
 
-        for(int i=0; i<3; ++i)
+        for (int i=0; i<3; ++i)
         {
             PortalGUID[i] = 0;
             BeamTarget[i] = 0;
             BeamerGUID[i] = 0;
         }
         // need core fix
-        for(int i=0; i<3; ++i)
+        for (int i=0; i<3; ++i)
         {
             if(SpellEntry *spell = (SpellEntry*)GetSpellStore()->LookupEntry(PlayerBuff[i]))
                 spell->AttributesEx |= SPELL_ATTR_EX_NEGATIVE;
@@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
         pos[GREEN_PORTAL] = (r%2 ? 0: (r>1 ? 2: 1));
         pos[BLUE_PORTAL] = (r>1 ? 1: 2); // Blue Portal not on the left side (0)
 
-        for(int i=0; i<3; ++i)
+        for (int i=0; i<3; ++i)
             if(Creature *portal = m_creature->SummonCreature(PortalID[i],PortalCoord[pos[i]][0],PortalCoord[pos[i]][1],PortalCoord[pos[i]][2],0,TEMPSUMMON_TIMED_DESPAWN,60000))
             {
                 PortalGUID[i] = portal->GetGUID();
@@ -144,7 +144,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
 
     void DestroyPortals()
     {
-        for(int i=0; i<3; ++i)
+        for (int i=0; i<3; ++i)
         {
             if(Creature *portal = Unit::GetCreature(*m_creature, PortalGUID[i]))
                 portal->DisappearAndDie();
@@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
 
     void UpdatePortals() // Here we handle the beams' behavior
     {
-        for(int j=0; j<3; ++j) // j = color
+        for (int j=0; j<3; ++j) // j = color
             if(Creature *portal = Unit::GetCreature(*m_creature, PortalGUID[j]))
             {
                 // the one who's been casted upon before
@@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
                     Map::PlayerList const& players = map->GetPlayers();
 
                     // get the best suitable target
-                    for(Map::PlayerList::const_iterator i = players.begin(); i!=players.end(); ++i)
+                    for (Map::PlayerList::const_iterator i = players.begin(); i!=players.end(); ++i)
                     {
                         Player* p = i->getSource();
                         if(p && p->isAlive() // alive
@@ -235,7 +235,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
         PortalPhase = false;
         DoScriptText(EMOTE_PHASE_BANISH,m_creature);
 
-        for(int i=0; i<3; ++i)
+        for (int i=0; i<3; ++i)
             m_creature->RemoveAurasDueToSpell(NetherBuff[i]);
     }
 
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
index 4f78b626067..c44cbcc7ced 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
@@ -188,10 +188,10 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
         InfernalCleanup();
         positions.clear();
 
-        for(uint8 i =0; i < 5; ++i)
+        for (uint8 i =0; i < 5; ++i)
             enfeeble_targets[i] = 0;
 
-        for(uint8 i = 0; i < TOTAL_INFERNAL_POINTS; ++i)
+        for (uint8 i = 0; i < TOTAL_INFERNAL_POINTS; ++i)
             positions.push_back(&InfernalPoints[i]);
 
         EnfeebleTimer = 30000;
@@ -224,7 +224,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
         InfernalCleanup();
         positions.clear();
 
-        for(uint8 i = 0; i < TOTAL_INFERNAL_POINTS; ++i)
+        for (uint8 i = 0; i < TOTAL_INFERNAL_POINTS; ++i)
             positions.push_back(&InfernalPoints[i]);
 
         if (pInstance)
@@ -242,7 +242,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
     void InfernalCleanup()
     {
         //Infernal Cleanup
-        for(std::vector<uint64>::iterator itr = infernals.begin(); itr!= infernals.end(); ++itr)
+        for (std::vector<uint64>::iterator itr = infernals.begin(); itr!= infernals.end(); ++itr)
         {
             Unit *pInfernal = Unit::GetUnit(*m_creature, *itr);
             if (pInfernal && pInfernal->isAlive())
@@ -256,7 +256,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
 
     void AxesCleanup()
     {
-        for(uint8 i=0; i<2; ++i)
+        for (uint8 i=0; i<2; ++i)
         {
             Unit *axe = Unit::GetUnit(*m_creature, axes[i]);
             if (axe && axe->isAlive())
@@ -291,7 +291,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
         //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
@@ -304,7 +304,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
             targets.erase(targets.begin()+rand()%targets.size());
 
         int i = 0;
-        for(std::vector<Unit *>::iterator iter = targets.begin(); iter!= targets.end(); ++iter, ++i)
+        for (std::vector<Unit *>::iterator iter = targets.begin(); iter!= targets.end(); ++iter, ++i)
         {
             Unit *target = *iter;
             if (target)
@@ -321,7 +321,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
 
     void EnfeebleResetHealth()
     {
-        for(uint8 i = 0; i < 5; ++i)
+        for (uint8 i = 0; i < 5; ++i)
         {
             Unit *target = Unit::GetUnit(*m_creature, enfeeble_targets[i]);
             if (target && target->isAlive())
@@ -431,7 +431,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
                 DoScriptText(SAY_AXE_TOSS2, m_creature);
 
                 Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
-                for(uint32 i=0; i<2; ++i)
+                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)
@@ -478,7 +478,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
                 Unit *target = SelectUnit(SELECT_TARGET_RANDOM, 0);
                 if (target)
                 {
-                    for(uint8 i = 0; i < 2; ++i)
+                    for (uint8 i = 0; i < 2; ++i)
                     {
                         Unit *axe = Unit::GetUnit(*m_creature, axes[i]);
                         if (axe)
@@ -570,7 +570,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)
+        for (std::vector<uint64>::iterator itr = infernals.begin(); itr!= infernals.end(); ++itr)
             if (*itr == infernal->GetGUID())
         {
             infernals.erase(itr);
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
index 5bdd4304d33..66f50881aa9 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
@@ -181,7 +181,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
             return;
 
         //store the threat list in a different container
-        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());
             //only on alive players
@@ -194,7 +194,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
             targets.erase(targets.begin()+rand()%targets.size());
 
         uint32 i = 0;
-        for(std::vector<Unit*>::iterator itr = targets.begin(); itr!= targets.end(); ++itr)
+        for (std::vector<Unit*>::iterator itr = targets.begin(); itr!= targets.end(); ++itr)
         {
             if (*itr)
             {
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
index f60fab0bddb..c19c7f1b14c 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
@@ -167,7 +167,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
 {
     boss_terestianAI(Creature *c) : ScriptedAI(c)
     {
-        for(uint8 i = 0; i < 2; ++i)
+        for (uint8 i = 0; i < 2; ++i)
             PortalGUID[i] = 0;
         pInstance = c->GetInstanceData();
     }
@@ -187,7 +187,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
 
     void Reset()
     {
-        for(uint8 i = 0; i < 2; ++i)
+        for (uint8 i = 0; i < 2; ++i)
         {
             if (PortalGUID[i])
             {
@@ -253,7 +253,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
 
     void JustDied(Unit *killer)
     {
-        for(uint8 i = 0; i < 2; ++i)
+        for (uint8 i = 0; i < 2; ++i)
         {
             if (PortalGUID[i])
             {
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/def_karazhan.h b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/def_karazhan.h
index 1c4c1f37eb0..56a6b106332 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/def_karazhan.h
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/def_karazhan.h
@@ -2,7 +2,6 @@
  * This program is free software licensed under GPL version 2
  * Please see the included DOCS/LICENSE.TXT for more information */
 
-
 #ifndef DEF_KARAZHAN_H
 #define DEF_KARAZHAN_H
 
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp
index 2ee3f3958cf..de82fb9c44b 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp
@@ -286,7 +286,7 @@ struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance
         loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
             >> 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 < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             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;
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp
index f392c50ca13..b7bd436f2a8 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp
@@ -240,7 +240,7 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
                 break;
         }
 
-        for(; index < count; ++index)
+        for (; index < count; ++index)
         {
             uint32 entry = ((uint32)Spawns[index][0]);
             float PosX = Spawns[index][1];
@@ -294,7 +294,7 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
                         return;
 
                     RaidWiped = true;
-                    for(Map::PlayerList::const_iterator i = PlayerList.begin();i != PlayerList.end(); ++i)
+                    for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
                     {
                         if (i->getSource()->isAlive() && !i->getSource()->isGameMaster())
                         {
@@ -507,7 +507,6 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
         YellTimer = 10000;
     }
 
-
     uint32 NextStep(uint32 Step)
     {
         Unit* arca = Unit::GetUnit((*m_creature),ArcanagosGUID);
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
index 3fc8e2dc4d1..d1d85cf55ee 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
@@ -181,7 +181,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI
 
         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)
+        for (i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
         {
             Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
             if (pUnit && pUnit->isAlive())
@@ -383,8 +383,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI
                             GravityLapseTimer = 30000;
                             GravityLapsePhase = 4;
 
-
-                            for(uint8 i = 0; i < 3; ++i)
+                            for (uint8 i = 0; i < 3; ++i)
                             {
                                 Unit* target = NULL;
                                 target = SelectUnit(SELECT_TARGET_RANDOM,0);
@@ -542,7 +541,6 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI
                 }else Death_Timer -= diff;
             }
 
-
         }
 
         if (!UpdateVictim())
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
index 546f42cae19..49af52a6c55 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
@@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
     {
         DoScriptText(SAY_AGGRO, m_creature);
 
-        for(uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
+        for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
         {
             if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[i]))
             {
@@ -166,7 +166,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
             LackeyEntryList.resize((sizeof(m_auiAddEntries) / sizeof(uint32)));
 
             //fill vector array with entries from Creature array
-            for(uint8 i = 0; i < LackeyEntryList.size(); ++i)
+            for (uint8 i = 0; i < LackeyEntryList.size(); ++i)
                 LackeyEntryList[i] = m_auiAddEntries[i];
 
             //remove random entries
@@ -174,7 +174,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
                 LackeyEntryList.erase(LackeyEntryList.begin() + rand()%LackeyEntryList.size());
 
             //summon all the remaining in vector
-            for(std::vector<uint32>::iterator itr = LackeyEntryList.begin(); itr != LackeyEntryList.end(); ++itr)
+            for (std::vector<uint32>::iterator itr = LackeyEntryList.begin(); itr != LackeyEntryList.end(); ++itr)
             {
                 if (Creature* pAdd = m_creature->SummonCreature((*itr), LackeyLocations[j][0], LackeyLocations[j][1], fZLocation, fOrientation, TEMPSUMMON_CORPSE_DESPAWN, 0))
                     m_auiLackeyGUID[j] = pAdd->GetGUID();
@@ -184,7 +184,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
         }
         else
         {
-            for(std::vector<uint32>::iterator itr = LackeyEntryList.begin(); itr != LackeyEntryList.end(); ++itr)
+            for (std::vector<uint32>::iterator itr = LackeyEntryList.begin(); itr != LackeyEntryList.end(); ++itr)
             {
                 Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[j]);
 
@@ -247,7 +247,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
         {
             uint32 health = m_creature->GetHealth();
             Unit* target = m_creature;
-            for(uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
+            for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
             {
                 if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[i]))
                 {
@@ -386,7 +386,7 @@ struct TRINITY_DLL_DECL boss_priestess_lackey_commonAI : public ScriptedAI
 
         if (pInstance)
         {
-            for(uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
+            for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
             {
                 if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUIDs[i]))
                 {
@@ -457,7 +457,7 @@ struct TRINITY_DLL_DECL boss_priestess_lackey_commonAI : public ScriptedAI
 
         if (Creature* Delrissa = (Unit::GetCreature(*m_creature, pInstance->GetData64(DATA_DELRISSA))))
         {
-            for(uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
+            for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
                 m_auiLackeyGUIDs[i] = CAST_AI(boss_priestess_delrissaAI, Delrissa->AI())->m_auiLackeyGUID[i];
         }
     }
@@ -810,7 +810,7 @@ struct TRINITY_DLL_DECL boss_yazzaiAI : public boss_priestess_lackey_commonAI
         {
             bool InMeleeRange = false;
             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)
             {
                 if (Unit* target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()))
                 {
@@ -890,7 +890,7 @@ struct TRINITY_DLL_DECL boss_warlord_salarisAI : public boss_priestess_lackey_co
         {
             bool InMeleeRange = false;
             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)
             {
                 if (Unit* target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()))
                 {
@@ -1218,7 +1218,7 @@ struct TRINITY_DLL_DECL boss_zelfanAI : public boss_priestess_lackey_commonAI
 
         if (Recombobulate_Timer < diff)
         {
-            for(uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
+            for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
             {
                 if (Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUIDs[i]))
                 {
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
index 080e2ad6f68..9cb816fa920 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
@@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
         if (pInstance)
         {
             uint32 size = pInstance->GetData(DATA_FEL_CRYSTAL_SIZE);
-            for(uint8 i = 0; i < size; ++i)
+            for (uint8 i = 0; i < size; ++i)
             {
                 uint64 guid = pInstance->GetData64(DATA_FEL_CRYSTAL);
                 debug_log("TSCR: Selin: Adding Fel Crystal %u to list", guid);
@@ -90,8 +90,8 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
     {
         if (pInstance)
         {
-            //for(uint8 i = 0; i < CRYSTALS_NUMBER; ++i)
-            for(std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
+            //for (uint8 i = 0; i < CRYSTALS_NUMBER; ++i)
+            for (std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
             {
                 //Unit* pUnit = Unit::GetUnit(*m_creature, FelCrystals[i]);
                 Unit* pUnit = Unit::GetUnit(*m_creature, *itr);
@@ -133,8 +133,8 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
         CrystalGUID = 0;
         Unit* pCrystal = NULL;
         Unit* CrystalChosen = NULL;
-        //for(uint8 i =  0; i < CRYSTALS_NUMBER; ++i)
-        for(std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
+        //for (uint8 i =  0; i < CRYSTALS_NUMBER; ++i)
+        for (std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
         {
             pCrystal = NULL;
             //pCrystal = Unit::GetUnit(*m_creature, FelCrystals[i]);
@@ -170,8 +170,8 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
         if (Crystals.empty())
             return;
 
-        //for(uint8 i = 0; i < CRYSTALS_NUMBER; ++i)
-        for(std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
+        //for (uint8 i = 0; i < CRYSTALS_NUMBER; ++i)
+        for (std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr)
         {
             //Creature* pCrystal = (Unit::GetCreature(*m_creature, FelCrystals[i]));
             Creature* pCrystal = Unit::GetCreature(*m_creature, *itr);
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp
index 4b7a68b9a61..be71b7a01ad 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp
@@ -77,7 +77,7 @@ struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS)
                 return true;
         return false;
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
index b23d5e72186..cd96acd80a8 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
@@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL npc_kalecgosAI : public ScriptedAI
 
         SpellEntry const* pSpell = GetSpellStore()->LookupEntry(SPELL_ORB_KILL_CREDIT);
 
-        for(Map::PlayerList::const_iterator i = lList.begin(); i != lList.end(); ++i)
+        for (Map::PlayerList::const_iterator i = lList.begin(); i != lList.end(); ++i)
         {
             if (Player* pPlayer = i->getSource())
             {
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp
index 9376250e3e8..449fb9566dc 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp
@@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI
                 DoScriptText(SAY_REINFORCEMENTS1, m_creature);
 
                 // summon 10 elementals
-                for(uint8 i = 0; i < 9; ++i)
+                for (uint8 i = 0; i < 9; ++i)
                 {
                     if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
                     {
@@ -239,7 +239,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI
             {
                 DoScriptText(SAY_REINFORCEMENTS2, m_creature);
 
-                for(uint8 i = 0; i < 9; ++i)
+                for (uint8 i = 0; i < 9; ++i)
                 {
                     if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
                     {
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp
index 6e7df410a98..5dea84aceb6 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp
@@ -93,7 +93,6 @@ struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance
         return false;
     };
 
-
     void OnGameObjectCreate(GameObject* pGo, bool add)
     {
         switch(pGo->GetEntry())
@@ -125,7 +124,6 @@ struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance
         }
     }
 
-
     void OnCreatureCreate(Creature* pCreature, bool add)
     {
         switch (pCreature->GetEntry())
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
index 449ed462a44..541da6747f9 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
@@ -204,7 +204,7 @@ void npc_unworthy_initiateAI::UpdateAI(const uint32 diff)
             float dist = 99.0f;
             GameObject *prison = NULL;
 
-            for(uint8 i = 0; i < 12; ++i)
+            for (uint8 i = 0; i < 12; ++i)
             {
                 if (GameObject* temp_prison = me->FindNearestGameObject(acherus_soul_prison[i],30))
                 {
@@ -733,7 +733,7 @@ struct TRINITY_DLL_DECL npc_scarlet_ghoulAI : public ScriptedAI
 
         if (!MinionList.empty())
         {
-            for(std::list<Creature*>::iterator itr = MinionList.begin(); itr != MinionList.end(); ++itr)
+            for (std::list<Creature*>::iterator itr = MinionList.begin(); itr != MinionList.end(); ++itr)
             {
                 if (CAST_CRE(*itr)->GetOwner()->GetGUID() == m_creature->GetOwner()->GetGUID())
                 {
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp
index a592b0cc9b0..fe482b7dc92 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp
@@ -241,7 +241,7 @@ struct TRINITY_DLL_DECL npc_koltira_deathweaverAI : public npc_escortAI
 
     void SummonAcolyte(uint32 uiAmount)
     {
-        for(uint32 i = 0; i < uiAmount; ++i)
+        for (uint32 i = 0; i < uiAmount; ++i)
             me->SummonCreature(NPC_CRIMSON_ACOLYTE, 1642.329, -6045.818, 127.583, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
     }
 
@@ -490,7 +490,6 @@ CreatureAI* GetAI_mob_high_inquisitor_valroth(Creature* pCreature)
     return new mob_high_inquisitor_valrothAI (pCreature);
 }
 
-
 /*######
 ## npc_a_special_surprise
 ######*/
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
index 0f64371f528..35baaef4b64 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
@@ -242,7 +242,7 @@ void UpdateWorldState(Map *map, uint32 id, uint32 state)
 
     if (!players.isEmpty())
     {
-        for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+        for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
         {
             if (Player* pPlayer = itr->getSource())
                 pPlayer->SendUpdateWorldState(id,state);
@@ -376,13 +376,13 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
             uiEligorGUID = NULL;
             uiRayneGUID = NULL;
 
-            for(uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
+            for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
             {
                 if (Creature* pTemp = Unit::GetCreature(*me, uiDefenderGUID[i]))
                     pTemp->setDeathState(JUST_DIED);
                 uiDefenderGUID[i] = 0;
             }
-            for(uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
+            for (uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
             {
                 if (Creature* pTemp = Unit::GetCreature(*me, uiEarthshatterGUID[i]))
                     pTemp->setDeathState(JUST_DIED);
@@ -402,25 +402,25 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
             uiOrbazGUID = NULL;
             uiThassarianGUID = NULL;
             uiLichKingGUID = NULL;
-            for(uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
+            for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
             {
                 if (Creature* pTemp = Unit::GetCreature(*me, uiAbominationGUID[i]))
                     pTemp->setDeathState(JUST_DIED);
                 uiAbominationGUID[i] = 0;
             }
-            for(uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
+            for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
             {
                 if (Creature* pTemp = Unit::GetCreature(*me, uiBehemothGUID[i]))
                     pTemp->setDeathState(JUST_DIED);
                 uiBehemothGUID[i] = 0;
             }
-            for(uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
+            for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
             {
                 if (Creature* pTemp = Unit::GetCreature(*me, uiGhoulGUID[i]))
                     pTemp->setDeathState(JUST_DIED);
                 uiGhoulGUID[i] = 0;
             }
-            for(uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
+            for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
             {
                 if (Creature* pTemp = Unit::GetCreature(*me, uiWarriorGUID[i]))
                     pTemp->setDeathState(JUST_DIED);
@@ -478,13 +478,13 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
                 if (Creature* pTemp = Unit::GetCreature(*me, uiMaxwellGUID))
                     DoScriptText(SAY_LIGHT_OF_DAWN08, pTemp);
 
-                for(uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
                     NPCChangeTarget(uiGhoulGUID[i]);
-                for(uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
                     NPCChangeTarget(uiWarriorGUID[i]);
-                for(uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
                     NPCChangeTarget(uiAbominationGUID[i]);
-                for(uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
                     NPCChangeTarget(uiBehemothGUID[i]);
                 NPCChangeTarget(uiKoltiraGUID);
                 NPCChangeTarget(uiOrbazGUID);
@@ -710,16 +710,16 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
                             pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
                             pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
                         }
-                        for(uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
+                        for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
                             if (Creature* pTemp = Unit::GetCreature(*me, uiAbominationGUID[i]))
                                 pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
-                        for(uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
+                        for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
                             if (Creature* pTemp = Unit::GetCreature(*me, uiBehemothGUID[i]))
                                 pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
-                        for(uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
+                        for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
                             if (Creature* pTemp = Unit::GetCreature(*me, uiGhoulGUID[i]))
                                 pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
-                        for(uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
+                        for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
                             if (Creature* pTemp = Unit::GetCreature(*me, uiWarriorGUID[i]))
                                 pTemp->GetMotionMaster()->MovePoint(0, LightofDawnLoc[0].x+rand()%30, LightofDawnLoc[0].y+rand()%30, LightofDawnLoc[0].z);
                         JumpToNextStep(5000);
@@ -1344,13 +1344,13 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
             // Check targets
             if (uiTargetcheck < diff)
             {
-                for(uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
                     NPCChangeTarget(uiGhoulGUID[i]);
-                for(uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
                     NPCChangeTarget(uiWarriorGUID[i]);
-                for(uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
                     NPCChangeTarget(uiAbominationGUID[i]);
-                for(uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
                     NPCChangeTarget(uiBehemothGUID[i]);
                 NPCChangeTarget(uiKoltiraGUID);
                 NPCChangeTarget(uiOrbazGUID);
@@ -1384,17 +1384,17 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
                 me->InterruptNonMeleeSpells(false);
                 me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
 
-                for(uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
                     DespawnNPC(uiDefenderGUID[i]);
-                for(uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
                     DespawnNPC(uiEarthshatterGUID[i]);
-                for(uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
                     DespawnNPC(uiAbominationGUID[i]);
-                for(uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
                     DespawnNPC(uiBehemothGUID[i]);
-                for(uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
                     DespawnNPC(uiGhoulGUID[i]);
-                for(uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
+                for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
                     DespawnNPC(uiWarriorGUID[i]);
 
                 if (Creature* pTemp = Unit::GetCreature(*me, uiKorfaxGUID))
@@ -1496,7 +1496,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
         Unit* pTemp = NULL;
 
         // Death
-        for(uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
+        for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
         {
             if (!(pTemp = Unit::GetCreature(*me, uiGhoulGUID[i])))
             {
@@ -1505,7 +1505,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
                 uiGhoulGUID[i] = pTemp->GetGUID();
             }
         }
-        for(uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
+        for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
         {
             if (!(pTemp = Unit::GetCreature(*me, uiAbominationGUID[i])))
             {
@@ -1514,7 +1514,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
                 uiAbominationGUID[i] = pTemp->GetGUID();
             }
         }
-        for(uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
+        for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
         {
             if (!(pTemp = Unit::GetCreature(*me, uiWarriorGUID[i])))
             {
@@ -1523,7 +1523,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
                 uiWarriorGUID[i] = pTemp->GetGUID();
             }
         }
-        for(uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
+        for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
         {
             if (!(pTemp = Unit::GetCreature(*me, uiBehemothGUID[i])))
             {
@@ -1534,7 +1534,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
         }
 
         // Dawn
-        for(uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
+        for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
         {
             if (!(pTemp = Unit::GetCreature(*me, uiDefenderGUID[i])))
             {
@@ -1544,7 +1544,7 @@ struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
                 uiDefenderGUID[i] = pTemp->GetGUID();
             }
         }
-        for(uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
+        for (uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
         {
             if (!(pTemp = Unit::GetCreature(*me, uiEarthshatterGUID[i])))
             {
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
index bce58b42632..18bd79a263e 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
@@ -506,7 +506,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
         std::list<Player*> temp;
         std::list<Player*>::iterator j;
 
-        for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+        for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
             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());
@@ -560,7 +560,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
             caster->GetMotionMaster()->MoveFollow(m_creature,6,urand(0,5));
             //DoResetThreat();//not sure if need
             std::list<HostilReference*>::iterator itr;
-            for(itr = caster->getThreatManager().getThreatList().begin(); itr != caster->getThreatManager().getThreatList().end(); ++itr)
+            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)
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp
index fc02cad4a2f..ecbd3695045 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp
@@ -47,7 +47,6 @@ struct TRINITY_DLL_DECL boss_herodAI : public ScriptedAI
     uint32 Cleave_Timer;
     uint32 Whirlwind_Timer;
 
-
     void Reset()
     {
         Enrage = false;
@@ -68,7 +67,7 @@ struct TRINITY_DLL_DECL boss_herodAI : public ScriptedAI
 
      void JustDied(Unit* killer)
      {
-         for(uint8 i = 0; i < 20; ++i)
+         for (uint8 i = 0; i < 20; ++i)
              m_creature->SummonCreature(ENTRY_SCARLET_TRAINEE, 1939.18, -431.58, 17.09, 6.22, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
      }
 
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
index 9859f3b8bd7..0ed5de79fe1 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
@@ -158,7 +158,6 @@ struct TRINITY_DLL_DECL boss_scarlet_commander_mograineAI : public ScriptedAI
         }
     }
 
-
     void UpdateAI(const uint32 uiDiff)
     {
         if (!UpdateVictim())
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
index 492493e2390..66653f008bf 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
@@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL instance_scarlet_monastery : public ScriptedInstance
         case DATA_HORSEMAN_EVENT:
             if (data == DONE)
             {
-                for(std::set<uint64>::iterator itr = HorsemanAdds.begin(); itr != HorsemanAdds.end(); ++itr)
+                for (std::set<uint64>::iterator itr = HorsemanAdds.begin(); itr != HorsemanAdds.end(); ++itr)
                 {
                     Creature* add = instance->GetCreature(*itr);
                     if (add && add->isAlive())
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp
index 7d304445fdc..07b28454280 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp
@@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI
 
             //Summon 10 Illusions attacking random gamers
             Unit* target = NULL;
-            for(uint8 i = 0; i < 10; ++i)
+            for (uint8 i = 0; i < 10; ++i)
             {
                 target = SelectUnit(SELECT_TARGET_RANDOM,0);
                 if (target)
@@ -132,7 +132,6 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI
             Illusion_Timer = 25000;
         }else Illusion_Timer -= diff;
 
-
         //            //Illusion_Timer
         //            if (Illusion_Timer < diff)
         //            {
@@ -195,7 +194,6 @@ struct TRINITY_DLL_DECL mob_illusionofjandicebarovAI : public ScriptedAI
     }
 };
 
-
 CreatureAI* GetAI_boss_jandicebarov(Creature* pCreature)
 {
     return new boss_jandicebarovAI (pCreature);
@@ -206,7 +204,6 @@ CreatureAI* GetAI_mob_illusionofjandicebarov(Creature* pCreature)
     return new mob_illusionofjandicebarovAI (pCreature);
 }
 
-
 void AddSC_boss_jandicebarov()
 {
     Script *newscript;
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp
index 282d6e9705a..8c124652a29 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp
@@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL instance_scholomance : public ScriptedInstance
         GateBarovGUID = 0;
         GateIlluciaGUID = 0;
 
-        for(uint8 i = 0; i < 6; ++i)
+        for (uint8 i = 0; i < 6; ++i)
             IsBossDied[i] = false;
     }
 
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
index 29a8d04a1cb..a4bc6c40f28 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
@@ -182,7 +182,7 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance
         std::istringstream loadStream(in);
         loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
 
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
         {
             if (m_auiEncounter[i] == IN_PROGRESS)
                 m_auiEncounter[i] = NOT_STARTED;
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp
index 69ff09067f5..702810caba0 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp
@@ -106,7 +106,6 @@ struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI
     {
     }
 
-
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp
index bac18320293..48c78e72953 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp
@@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_ramstein_the_gorgerAI : public ScriptedAI
 
     void JustDied(Unit* Killer)
     {
-        for(uint8 i = 0; i < 30; ++i)
+        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))
                 mob->AI()->AttackStart(m_creature->SelectNearestTarget(500));
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
index d475e116039..fe0845118ee 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
@@ -76,10 +76,10 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
 
     void Initialize()
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             Encounter[i] = NOT_STARTED;
 
-        for(uint8 i = 0; i < 5; ++i)
+        for (uint8 i = 0; i < 5; ++i)
             IsSilverHandDead[i] = false;
 
         BaronRun_Timer = 0;
@@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
                     UpdateGoState(portGauntletGUID,GO_STATE_READY,false);
 
                 uint32 count = abomnationGUID.size();
-                for(std::set<uint64>::iterator i = abomnationGUID.begin(); i != abomnationGUID.end(); ++i)
+                for (std::set<uint64>::iterator i = abomnationGUID.begin(); i != abomnationGUID.end(); ++i)
                 {
                     if (Creature* pAbom = instance->GetCreature(*i))
                     {
@@ -264,7 +264,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
 
                     if (!players.isEmpty())
                     {
-                        for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                        for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         {
                             if (Player* pPlayer = itr->getSource())
                             {
@@ -332,7 +332,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
         loadStream >> Encounter[0] >> Encounter[1] >> Encounter[2] >> Encounter[3]
         >> Encounter[4] >> Encounter[5];
 
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (Encounter[i] == IN_PROGRESS)
                 Encounter[i] = NOT_STARTED;
 
@@ -394,7 +394,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
             {
                 if (Creature* pBaron = instance->GetCreature(baronGUID))
                 {
-                    for(uint8 i = 0; i < 4; ++i)
+                    for (uint8 i = 0; i < 4; ++i)
                         pBaron->SummonCreature(C_BLACK_GUARD,4032.84,-3390.24,119.73,4.71,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000);
 
                     UpdateGoState(ziggurat4GUID,GO_STATE_ACTIVE,false);
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp
index 1d0473e1d9b..4f8d19a305e 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp
@@ -47,7 +47,7 @@ bool GOHello_go_gauntlet_gate(Player* pPlayer, GameObject* pGo)
 
     if (Group *pGroup = pPlayer->GetGroup())
     {
-        for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+        for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player* pGroupie = itr->getSource();
             if (!pGroupie)
@@ -197,7 +197,7 @@ struct TRINITY_DLL_DECL mobs_spectral_ghostly_citizenAI : public ScriptedAI
     {
         if (Tagged)
         {
-            for(uint32 i = 1; i <= 4; ++i)
+            for (uint32 i = 1; i <= 4; ++i)
             {
                  //100%, 50%, 33%, 25% chance to spawn
                  if (urand(1,i) == 1)
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
index 42ec8d5d784..502a1827728 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
@@ -128,7 +128,6 @@ struct TRINITY_DLL_DECL instance_sunken_temple : public ScriptedInstance
          }
      };
 
-
      virtual void Update(uint32 diff) // correct order goes form 1-6
      {
          switch(State)
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
index 1d46bba348b..6c62c75e35d 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
@@ -298,7 +298,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
         {
             Unit* target = NULL;
             Creature* temp = NULL;
-            for(uint8 i = 0;i<3; ++i)
+            for (uint8 i = 0; i<3; ++i)
             {
                 target = SelectUnit(SELECT_TARGET_RANDOM, 0);
                 temp = DoSpawnCreature(MOB_SHADOW_IMAGE,0,0,0,0,TEMPSUMMON_CORPSE_DESPAWN,10000);
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
index b81cbca3516..68cc122bfd1 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
@@ -432,7 +432,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
         }
 
         Event = EVENT_NULL;
-        for(uint32 i = 1; i <= MaxTimer[Phase]; ++i)
+        for (uint32 i = 1; i <= MaxTimer[Phase]; ++i)
         {
             if (Timer[i])
                 if (Timer[i] <= diff)
@@ -533,7 +533,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
             cell_lock->Visit(cell_lock, cSearcher, *(m_creature->GetMap()));
         }
 
-        for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
+        for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
         {
             if (entry == MOB_VAPOR_TRAIL && Phase == PHASE_FLIGHT)
             {
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
index 22328334919..01b74fc6aa8 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
@@ -88,7 +88,6 @@ enum SWPActions
     DO_BANISH    =  2
 };
 
-
 #define GO_FAILED   "You are unable to use this currently."
 
 #define EMOTE_UNABLE_TO_FIND    "is unable to find Kalecgos"
@@ -303,7 +302,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI
             {
                 std::list<HostilReference*> &m_threatlist = me->getThreatManager().getThreatList();
                 std::list<Unit*> targetList;
-                for(std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr)
+                for (std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr)
                     if((*itr)->getTarget() && (*itr)->getTarget()->GetTypeId() == TYPEID_PLAYER && (*itr)->getTarget()->GetGUID() != me->getVictim()->GetGUID() && !(*itr)->getTarget()->HasAura(AURA_SPECTRAL_EXHAUSTION) && (*itr)->getTarget()->GetPositionZ() > me->GetPositionZ()-5)
                         targetList.push_back((*itr)->getTarget());
                 if(targetList.empty())
@@ -520,7 +519,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
         Map* pMap = me->GetMap();
         if (!pMap->IsDungeon()) return;
         Map::PlayerList const &PlayerList = pMap->GetPlayers();
-        for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+        for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
         {
             if(i->getSource()->GetPositionZ() <= DRAGON_REALM_Z-5)
             {
@@ -600,7 +599,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
 
         if (ResetThreat < diff)
         {
-            for(std::list<HostilReference*>::iterator itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr)
+            for (std::list<HostilReference*>::iterator itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr)
             {
                 if(Unit* pUnit = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()))
                 {
@@ -735,7 +734,7 @@ bool GOkalecgos_teleporter(Player* pPlayer, GameObject* pGo)
     Map* pMap = pGo->GetMap();
     if (!pMap->IsDungeon()) return true;
     Map::PlayerList const &PlayerList = pMap->GetPlayers();
-    for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+    for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
     {
         if(i->getSource() && i->getSource()->GetPositionZ() < DEMON_REALM_Z + 5)
             SpectralPlayers++;
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
index 3bb91d52110..e9e18e4383c 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
@@ -115,7 +115,6 @@ enum SpellIds
     /* Shield Orb Spells*/
     SPELL_SHADOW_BOLT                                   = 45680, //45679 would be correct but triggers to often //TODO fix console error
 
-
     /* Anveena's spells and cosmetics (Or, generally, everything that has "Anveena" in name) */
     SPELL_ANVEENA_PRISON                                = 46367, // She hovers locked within a bubble
     SPELL_ANVEENA_ENERGY_DRAIN                          = 46410, // Sunwell energy glow animation (Control mob uses this)
@@ -282,7 +281,7 @@ bool GOHello_go_orb_of_the_blue_flight(Player* pPlayer, GameObject* pGo)
         pGo->GetPosition(x,y,z);
         // this won't work. need rewritten
         /*
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             if (DynamicObject* Dyn = Kalec->GetDynObject(SPELL_RING_OF_BLUE_FLAMES))
             {
@@ -316,7 +315,7 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
     bool Searched;
 
     void InitializeAI(){
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
             Orb[i] = NULL;
         FindOrbs();
         OrbsEmpowered = 0;
@@ -347,7 +346,7 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
         if (orbList.empty())
             return;
         uint8 i = 0;
-        for(std::list<GameObject*>::iterator itr = orbList.begin(); itr != orbList.end(); ++itr, ++i){
+        for (std::list<GameObject*>::iterator itr = orbList.begin(); itr != orbList.end(); ++itr, ++i){
             Orb[i] = pInstance ? pInstance->instance->GetGameObject(pInstance->GetData64((*itr)->GetGUID())) : NULL;
         }
     }
@@ -355,7 +354,7 @@ 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)
+        for (uint8 i = 0; i < 4; ++i)
             if (Orb[i]) Orb[i]->SetUInt32Value(GAMEOBJECT_FACTION, 0);
     }
 
@@ -367,7 +366,7 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
         if (all)
         {
             m_creature->RemoveDynObject(SPELL_RING_OF_BLUE_FLAMES);
-            for(uint8 i = 0; i < 4; ++i)
+            for (uint8 i = 0; i < 4; ++i)
             {
                 if (!Orb[i]) return;
                 Orb[i]->CastSpell(m_creature, SPELL_RING_OF_BLUE_FLAMES);
@@ -382,7 +381,7 @@ struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
             /*
             float x,y,z, dx,dy,dz;
             Orb[random]->GetPosition(x,y,z);
-            for(uint8 i = 0; i < 4; ++i){
+            for (uint8 i = 0; i < 4; ++i){
                 DynamicObject* Dyn = m_creature->GetDynObject(SPELL_RING_OF_BLUE_FLAMES);
                 if (Dyn){
                     Dyn->GetPosition(dx,dy,dz);
@@ -493,7 +492,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
 
     void ChangeTimers(bool status, uint32 WTimer)
     {
-        for(uint8 i = 0; i < 10; ++i)
+        for (uint8 i = 0; i < 10; ++i)
             TimerIsDeactiveted[i] = status;
         TimerIsDeactiveted[TIMER_KALEC_JOIN] = IsKalecJoined;
 
@@ -558,11 +557,11 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
     {
         DoScriptText(RAND(SAY_KJ_REFLECTION1,SAY_KJ_REFLECTION2), m_creature);
         DoCast(m_creature, SPELL_SINISTER_REFLECTION, true);
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             float x,y,z;
             Unit* target;
-            for(uint8 z = 0; z < 6; ++z)
+            for (uint8 z = 0; z < 6; ++z)
             {
                 target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
                 if (!target->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0))break;
@@ -588,7 +587,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
             } else WaitTimer -= diff;
         }
 
-        for(uint8 t = 0; t < ActiveTimers; ++t)
+        for (uint8 t = 0; t < ActiveTimers; ++t)
         {
             if (Timer[t] < diff && !TimerIsDeactiveted[t])
             {
@@ -614,7 +613,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
                         if (!m_creature->IsNonMeleeSpellCasted(false))
                         {
                             m_creature->RemoveAurasDueToSpell(SPELL_SOUL_FLAY);
-                            for(uint8 z = 0; z < 6; ++z)
+                            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;
@@ -637,7 +636,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
                         }
                         break;
                     case TIMER_SUMMON_SHILEDORB:
-                        for(uint8 i = 1; i < Phase; ++i)
+                        for (uint8 i = 1; i < Phase; ++i)
                         {
                             float sx, sy;
                             sx = ShieldOrbLocations[0][0] + sin(ShieldOrbLocations[i][0]);
@@ -704,7 +703,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
                         break;
                     case TIMER_ARMAGEDDON: //Phase 4
                         Unit* target;
-                        for(uint8 z = 0; z < 6; ++z)
+                        for (uint8 z = 0; z < 6; ++z)
                         {
                             target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
                             if (!target->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT,0)) break;
@@ -722,7 +721,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
             }
         }
             //Time runs over!
-            for(uint8 i = 0; i < ActiveTimers; ++i)
+            for (uint8 i = 0; i < ActiveTimers; ++i)
                 if (!TimerIsDeactiveted[i])
                 {
                     Timer[i] -= diff;
@@ -945,7 +944,7 @@ struct TRINITY_DLL_DECL mob_hand_of_the_deceiverAI : public ScriptedAI
             if (Portal)
             {
                 std::list<HostilReference*>::iterator itr;
-                for(itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++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)
@@ -1343,7 +1342,7 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI
                 break;
             }
             debug_log("Sinister-Timer");
-            for(uint8 i = 0; i < 3; ++i)
+            for (uint8 i = 0; i < 3; ++i)
                 Timer[i] -= diff;
         }
 
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp
index ba95eb51e0f..ea679322225 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp
@@ -325,13 +325,13 @@ struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI
                         else
                         {
                             DarkFiend = false;
-                            for(uint8 i = 0; i < 8; ++i)
+                            for (uint8 i = 0; i < 8; ++i)
                                 m_creature->SummonCreature(CREATURE_DARK_FIENDS,DarkFiends[i][0],DarkFiends[i][1],DarkFiends[i][2], DarkFiends[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
                             Timer[TIMER_DARKNESS] = 42000;
                         }
                         break;
                     case TIMER_HUMANOIDES:
-                        for(uint8 i = 0; i < 6; ++i)
+                        for (uint8 i = 0; i < 6; ++i)
                             m_creature->SummonCreature(Humanoides[i][0],Humanoides[i][1],Humanoides[i][2],Humanoides[i][3], Humanoides[i][4], TEMPSUMMON_CORPSE_DESPAWN, 0);
                         Timer[TIMER_HUMANOIDES] = 60000;
                         break;
@@ -351,7 +351,7 @@ struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI
         }
 
         //Timer
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             if (i != TIMER_PHASE)Timer[i] -= diff;
             else if (Phase == 2) Timer[i] -= diff;
@@ -459,7 +459,7 @@ struct TRINITY_DLL_DECL npc_dark_fiendAI : public ScriptedAI
 
     void SpellHit(Unit* caster, const SpellEntry* Spell)
     {
-        for(uint8 i = 0; i < 3; ++i)
+        for (uint8 i = 0; i < 3; ++i)
             if (Spell->Effect[i] == 38)
                 m_creature->DisappearAndDie();
     }
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
index 4195ebd91a5..9e1fc10d684 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
@@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS)
                 return true;
 
@@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
 
         if (!players.isEmpty())
         {
-            for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+            for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
             {
                 Player* plr = itr->getSource();
                 if (plr && !plr->HasAura(45839,0))
@@ -272,7 +272,7 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
         std::istringstream stream(in);
         stream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
             >> m_auiEncounter[4] >> m_auiEncounter[5];
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             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;
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp
index e68717857cb..9eac24fa45e 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.cpp
@@ -51,7 +51,6 @@ enum LiadrinnSpeeches
     LIADRIN_SAY3 = -1580109
 };
 
-
 /*######
 ## npc_captain_selana
 ######*/
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp
index 203fc8268d5..e5de9848728 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp
@@ -26,7 +26,6 @@ EndScriptData */
 
 #include "precompiled.h"
 
-
 #define SAY_AGGRO           "Who dares awaken Archaedas? Who dares the wrath of the makers!"
 #define SOUND_AGGRO         5855
 
@@ -92,7 +91,6 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI
         }
     }
 
-
     void EnterCombat(Unit *who)
     {
         m_creature->setFaction (14);
@@ -135,7 +133,6 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-
         // wake a wall minion
         if (WallMinionTimer < diff) {
             pInstance->SetData (NULL, 2);
@@ -167,7 +164,6 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI
             vaultWalkersAwake = true;
         }
 
-
         if (Tremor_Timer < diff)
         {
             //Cast
@@ -202,7 +198,6 @@ SDComment: These mobs are initially frozen until Archaedas awakens them
 one at a time.
 EndScriptData */
 
-
 #define SPELL_ARCHAEDAS_AWAKEN        10347
 
 struct TRINITY_DLL_DECL mob_archaedas_minionsAI : public ScriptedAI
@@ -273,7 +268,6 @@ struct TRINITY_DLL_DECL mob_archaedas_minionsAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-
         DoMeleeAttackIfReady();
     }
 };
@@ -290,7 +284,6 @@ SDComment: Needs 1 person to activate the Archaedas script
 SDCategory: Uldaman
 EndScriptData */
 
-
 #define OBJECT_ALTAR_OF_ARCHAEDAS   133234
 
 #define NUMBER_NEEDED_TO_ACTIVATE 1 // as of patch 3.0.8 the altars can be opened by a single player (previously 3)
@@ -300,7 +293,6 @@ EndScriptData */
 //uint64 altarOfArchaedasCount[5];
 //int32 altarOfArchaedasCounter=0;
 
-
 bool GOHello_go_altar_of_archaedas(Player* pPlayer, GameObject* pGo)
 {
     //bool alreadyUsed;
@@ -413,7 +405,6 @@ SDComment: Need 1 person to activate to open the altar.  One by one the StoneKee
 SDCategory: Uldaman
 EndScriptData */
 
-
 #define SPELL_BOSS_OBJECT_VISUAL    11206
 
 #define NUMBER_NEEDED_TO_ACTIVATE 1 // as of patch 3.0.8 the altars can be opened by a single player (previously 3)
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp
index 21b639e2449..f4d13731de1 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp
@@ -14,10 +14,8 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-
 #include "precompiled.h"
 
-
 #define SPELL_ARCHAEDAS_AWAKEN        10347
 #define SPELL_AWAKEN_VAULT_WALKER     10258
 
@@ -98,7 +96,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
 
     void ActivateStoneKeepers()
     {
-        for(std::vector<uint64>::iterator i = stoneKeeper.begin(); i != stoneKeeper.end(); ++i)
+        for (std::vector<uint64>::iterator i = stoneKeeper.begin(); i != stoneKeeper.end(); ++i)
         {
             Creature *target = instance->GetCreature(*i);
             if (!target || !target->isAlive() || target->getFaction()==14)
@@ -118,7 +116,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
         if (!archaedas)
             return;
 
-        for(std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
+        for (std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
         {
             Creature *target = instance->GetCreature(*i);
             if (!target || !target->isAlive() || target->getFaction()==14)
@@ -133,7 +131,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
     void DeActivateMinions()
     {
         // first despawn any aggroed wall minions
-        for(std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
+        for (std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
         {
             Creature *target = instance->GetCreature(*i);
             if (!target || target->isDead() || target->getFaction()!=14)
@@ -143,7 +141,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
         }
 
         // Vault Walkers
-        for(std::vector<uint64>::iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i)
+        for (std::vector<uint64>::iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i)
         {
             Creature *target = instance->GetCreature(*i);
             if (!target || target->isDead() || target->getFaction()!=14)
@@ -153,7 +151,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
         }
 
         // Earthen Guardians
-        for(std::vector<uint64>::iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i)
+        for (std::vector<uint64>::iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i)
         {
             Creature *target = instance->GetCreature(*i);
             if (!target || target->isDead() || target->getFaction()!=14)
@@ -179,7 +177,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
     void RespawnMinions()
     {
         // first respawn any aggroed wall minions
-        for(std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
+        for (std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
         {
             Creature *target = instance->GetCreature(*i);
             if (target && target->isDead())
@@ -191,7 +189,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
         }
 
         // Vault Walkers
-        for(std::vector<uint64>::iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i)
+        for (std::vector<uint64>::iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i)
         {
             Creature *target = instance->GetCreature(*i);
             if (target && target->isDead())
@@ -203,7 +201,7 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
         }
 
         // Earthen Guardians
-        for(std::vector<uint64>::iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i)
+        for (std::vector<uint64>::iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i)
         {
             Creature *target = instance->GetCreature(*i);
             if (target && target->isDead())
@@ -227,7 +225,6 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
         if (data==5) RespawnMinions();
     }
 
-
     void SetData64 (uint32 type, uint64 data)
     {
         // Archaedas
@@ -237,7 +234,6 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
         }
     }
 
-
     void OnCreatureCreate(Creature* pCreature, bool add)
     {
         switch (pCreature->GetEntry()) {
@@ -288,8 +284,6 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
     } // end GetData64
 };
 
-
-
 InstanceData* GetInstanceData_instance_uldaman(Map* pMap)
 {
     return new instance_uldaman(pMap);
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/undercity.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/undercity.cpp
index ecfd0894ddf..6c761b9248e 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/undercity.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/undercity.cpp
@@ -125,7 +125,7 @@ bool ChooseReward_npc_lady_sylvanas_windrunner(Player* pPlayer, Creature* pCreat
         CAST_AI(npc_lady_sylvanas_windrunnerAI, pCreature->AI())->DoPlaySoundToSet(pCreature,SOUND_CREDIT);
         pCreature->CastSpell(pCreature,SPELL_SYLVANAS_CAST,false);
 
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
             pCreature->SummonCreature(ENTRY_HIGHBORNE_LAMENTER, HighborneLoc[i][0], HighborneLoc[i][1], HIGHBORNE_LOC_Y, HighborneLoc[i][2], TEMPSUMMON_TIMED_DESPAWN, 160000);
     }
 
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/wetlands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/wetlands.cpp
index d50d0fa2d2d..3ba504c6d7a 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/wetlands.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/wetlands.cpp
@@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL npc_tapoke_slim_jahnAI : public npc_escortAI
 
         if (HasEscortState(STATE_ESCORT_ESCORTING) && !m_bFriendSummoned && pPlayer)
         {
-            for(uint8 i = 0; i < 3; ++i)
+            for (uint8 i = 0; i < 3; ++i)
                 m_creature->CastSpell(m_creature, SPELL_CALL_FRIENDS, true);
 
             m_bFriendSummoned = true;
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
index 8ac1d4166e6..f093de53185 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
@@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
         CloudGUID = 0;
         CycloneGUID = 0;
         DespawnSummons();
-        for(uint8 i = 0; i < 8; ++i)
+        for (uint8 i = 0; i < 8; ++i)
             BirdGUIDs[i] = 0;
 
         StormCount = 0;
@@ -175,7 +175,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
         {
             // deal damage
             int32 bp0 = 800;
-            for(uint8 i = 2; i < StormCount; ++i)
+            for (uint8 i = 2; i < StormCount; ++i)
                 bp0 *= 2;
 
             CellPair p(Trinity::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY()));
@@ -197,7 +197,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
                 cell_lock->Visit(cell_lock, grid_unit_searcher, *(m_creature->GetMap()));
             }
             //dealdamege
-            for(std::list<Unit*>::iterator i = tempUnitMap.begin(); i != tempUnitMap.end(); ++i)
+            for (std::list<Unit*>::iterator i = tempUnitMap.begin(); i != tempUnitMap.end(); ++i)
             {
                 if (!Cloud->IsWithinDist(*i, 6, false))
                 {
@@ -207,7 +207,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
             // visual
             float x,y,z;
             z = m_creature->GetPositionZ();
-            for(uint8 i = 0; i < 5+rand()%5; ++i)
+            for (uint8 i = 0; i < 5+rand()%5; ++i)
             {
                 x = 343+rand()%60;
                 y = 1380+rand()%60;
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp
index d2933de614f..ba3fbe750eb 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp
@@ -204,7 +204,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
     {
         pInstance = c->GetInstanceData();
         SelectAddEntry();
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
             AddGUID[i] = 0;
     }
 
@@ -253,7 +253,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
         m_creature->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, NULL);
         DoPlaySoundToSet(m_creature, SOUND_YELL_AGGRO);
 
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             Unit* Temp = Unit::GetUnit((*m_creature),AddGUID[i]);
             if (Temp && Temp->isAlive())
@@ -289,7 +289,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
         m_creature->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, NULL);
         DoPlaySoundToSet(m_creature, SOUND_YELL_DEATH);
 
-        for(uint8 i = 0; i < 4 ; ++i)
+        for (uint8 i = 0; i < 4 ; ++i)
         {
             Unit* Temp = Unit::GetUnit((*m_creature),AddGUID[i]);
             if (Temp && Temp->isAlive())
@@ -301,20 +301,20 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
     {
         std::vector<uint32> AddList;
 
-        for(uint8 i = 0; i < 8; ++i)
+        for (uint8 i = 0; i < 8; ++i)
             AddList.push_back(AddEntryList[i]);
 
         while(AddList.size() > 4)
             AddList.erase(AddList.begin()+rand()%AddList.size());
 
         uint8 i = 0;
-        for(std::vector<uint32>::iterator itr = AddList.begin(); itr != AddList.end(); ++itr, ++i)
+        for (std::vector<uint32>::iterator itr = AddList.begin(); itr != AddList.end(); ++itr, ++i)
             AddEntry[i] = *itr;
     }
 
     void SpawnAdds()
     {
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             Creature *pCreature = (Unit::GetCreature((*m_creature), AddGUID[i]));
             if (!pCreature || !pCreature->isAlive())
@@ -349,7 +349,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
 
         if (CheckAddState_Timer < diff)
         {
-            for(uint8 i = 0; i < 4; ++i)
+            for (uint8 i = 0; i < 4; ++i)
             {
                 Unit* Temp = Unit::GetUnit((*m_creature),AddGUID[i]);
                 if (Temp && Temp->isAlive() && !Temp->getVictim())
@@ -706,7 +706,6 @@ struct TRINITY_DLL_DECL boss_slitherAI : public boss_hexlord_addAI
 
     uint32 venomspit_timer;
 
-
     void Reset()
     {
         venomspit_timer = 5000;
@@ -753,7 +752,6 @@ struct TRINITY_DLL_DECL boss_fenstalkerAI : public boss_hexlord_addAI
 
     uint32 volatileinf_timer;
 
-
     void Reset()
     {
         volatileinf_timer = 15000;
@@ -780,7 +778,6 @@ struct TRINITY_DLL_DECL boss_fenstalkerAI : public boss_hexlord_addAI
 #define SPELL_COLD_STARE      43593
 #define SPELL_MIGHTY_BLOW     43592
 
-
 struct TRINITY_DLL_DECL boss_koraggAI : public boss_hexlord_addAI
 {
     boss_koraggAI(Creature *c) : boss_hexlord_addAI(c) {}
@@ -788,7 +785,6 @@ struct TRINITY_DLL_DECL boss_koraggAI : public boss_hexlord_addAI
     uint32 coldstare_timer;
     uint32 mightyblow_timer;
 
-
     void Reset()
     {
         coldstare_timer = 15000;
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
index d946b26ffdf..e8eaee46895 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
@@ -149,7 +149,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
 
         isFlameBreathing = false;
 
-        for(uint8 i = 0; i < 40; ++i)
+        for (uint8 i = 0; i < 40; ++i)
             FireBombGUIDs[i] = 0;
 
         HatchAllEggs(1);
@@ -190,14 +190,14 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
     {
         uint8 WallNum;
         Creature* wall = NULL;
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             if (i == 0 || i == 2)
                 WallNum = 3;
             else
                 WallNum = 2;
 
-            for(uint8 j = 0; j < WallNum; j++)
+            for (uint8 j = 0; j < WallNum; j++)
             {
                 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);
@@ -211,7 +211,7 @@ 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);
@@ -247,7 +247,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
         if (!templist.size())
             return false;
 
-        for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
+        for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
         {
             if (uiAction == 1)
                (*i)->SetDisplayId(10056);
@@ -277,7 +277,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
             CellLock<GridReadGuard> cell_lock(cell, pair);
             cell_lock->Visit(cell_lock, cSearcher, *(m_creature->GetMap()));
         }
-        for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
+        for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
         {
            (*i)->CastSpell(*i, SPELL_FIRE_BOMB_DAMAGE, true);
            (*i)->RemoveAllAuras();
@@ -376,7 +376,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
             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)
+            for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
             {
                 if (Player* i_pl = i->getSource())
                     if (i_pl->isAlive())
@@ -514,7 +514,7 @@ struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI
 
         //error_log("Eggs %d at %d", templist.size(), side);
 
-        for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end() && num > 0; ++i)
+        for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end() && num > 0; ++i)
         {
             if ((*i)->GetDisplayId() != 11686)
             {
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp
index c15df162430..fb1a996ea24 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp
@@ -88,7 +88,6 @@ float NalorakkWay[8][3] =
 #define YELL_SHIFTEDTOBEAR      "You call on da beast, you gonna get more dan you bargain for!"
 #define SOUND_YELL_TOBEAR       12072
 
-
 struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
 {
     boss_nalorakkAI(Creature *c) : ScriptedAI(c)
@@ -169,7 +168,7 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
         if (!templist.size())
             return;
 
-        for(std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
+        for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i)
         {
             if ((*i) && m_creature->IsWithinDistInMap((*i),25))
             {
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp
index a8df5202e64..47b55f4c4bb 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp
@@ -98,7 +98,6 @@ EndScriptData */
 
 #define SPELL_BERSERK 45078
 
-
 #define PHASE_BEAR 0
 #define PHASE_EAGLE 1
 #define PHASE_LYNX 2
@@ -287,7 +286,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
     void SpawnAdds()
     {
         Creature *pCreature = NULL;
-        for(uint8 i = 0; i < 4; ++i)
+        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)
@@ -302,7 +301,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
 
     void DespawnAdds()
     {
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             Unit* Temp = NULL;
             if (SpiritGUID[i])
@@ -355,7 +354,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
             {
                 m_creature->GetMotionMaster()->Clear();
                 m_creature->CastSpell(m_creature, SPELL_ENERGY_STORM, true); // enemy aura
-                for(uint8 i = 0; i < 4; ++i)
+                for (uint8 i = 0; i < 4; ++i)
                 {
                     Creature* Vortex = DoSpawnCreature(CREATURE_FEATHER_VORTEX, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
                     if (Vortex)
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp
index 74186442d9e..c12d3117949 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp
@@ -92,13 +92,13 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
         BossKilled = 0;
         ChestLooted = 0;
 
-        for(uint8 i = 0; i < RAND_VENDOR; ++i)
+        for (uint8 i = 0; i < RAND_VENDOR; ++i)
             RandVendor[i] = NOT_STARTED;
     }
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.cpp
index e3142e50540..ff475597b88 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.cpp
@@ -147,7 +147,7 @@ bool GossipSelect_npc_zulaman_hostage(Player* pPlayer, Creature* pCreature, uint
         float x, y, z;
         pCreature->GetPosition(x, y, z);
         uint32 entry = pCreature->GetEntry();
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             if (HostageEntry[i] == entry)
             {
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp
index 0b11bd59d6c..9875dc642da 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp
@@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL boss_hazzarahAI : public ScriptedAI
             //We will summon 3 illusions that will spawn on a random gamer and attack this gamer
             //We will just use one model for the beginning
             Unit* target = NULL;
-            for(uint8 i = 0; i < 3; ++i)
+            for (uint8 i = 0; i < 3; ++i)
             {
                 target = SelectUnit(SELECT_TARGET_RANDOM,0);
                 if (!target)
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
index 0408cdc1e95..c6792f82451 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
@@ -219,7 +219,7 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI
                     TargetInRange = 0;
 
                     std::list<HostilReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin();
-                    for(; i != m_creature->getThreatManager().getThreatList().end(); ++i)
+                    for (; i != m_creature->getThreatManager().getThreatList().end(); ++i)
                     {
                         Unit* pUnit = Unit::GetUnit(*m_creature, (*i)->getUnitGuid());
                         if (pUnit && m_creature->IsWithinMeleeRange(pUnit))
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp
index 2ff7597f0fa..4eb7b649a88 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp
@@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI
                 if (HolyNova_Timer < diff)
                 {
                     TargetInRange = 0;
-                    for(uint8 i=0; i<10; ++i)
+                    for (uint8 i=0; i<10; ++i)
                     {
                         if (Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO,i))
                             if (m_creature->IsWithinMeleeRange(target))
diff --git a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp
index 76d7ff0e4af..74d0c5528f8 100644
--- a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp
@@ -323,7 +323,6 @@ struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI
 {
     npc_magwinAI(Creature *c) : npc_escortAI(c) {}
 
-
     void WaypointReached(uint32 i)
     {
         Player* pPlayer = GetPlayerForEscort();
@@ -487,7 +486,7 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI
         Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(m_creature, players, checker);
         m_creature->VisitNearbyWorldObject(radius, searcher);
 
-        for(std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr)
+        for (std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr)
         {
             if((*itr)->GetQuestStatus(QUEST_TREES_COMPANY)==QUEST_STATUS_INCOMPLETE
                 &&(*itr)->HasAuraEffect(SPELL_TREE_DISGUISE,3) )
@@ -504,7 +503,7 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI
 
         if (!FlagList.empty())
         {
-            for(std::list<GameObject*>::iterator itr = FlagList.begin(); itr != FlagList.end(); ++itr)
+            for (std::list<GameObject*>::iterator itr = FlagList.begin(); itr != FlagList.end(); ++itr)
             {
                 if (despawn)
                 {
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
index 261ed4a5ca0..53052f0f9e0 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
@@ -84,14 +84,14 @@ struct TRINITY_DLL_DECL boss_meathookAI : public ScriptedAI
             std::list<HostilReference*>::iterator itr;
 
             int st=0;
-            for(itr = m_threatlist.begin(); itr != m_threatlist.end(); ++itr)
+            for (itr = m_threatlist.begin(); itr != m_threatlist.end(); ++itr)
             {
                 //st++;
                 m_creature->getThreatManager().
             }
             Unit* targets[st];
             int st2=0;
-            for(int i=1; i<=st; ++i){
+            for (int i=1; i<=st; ++i){
                 if (!IsWithinLOSInMap(targets[i])
                     st2++;
             }
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
index 6984f287950..afb2759a9f9 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
@@ -311,7 +311,7 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI
 
         if (entry == C_WHELP)
         {
-            for(uint8 i = 0; i < 3; ++i)
+            for (uint8 i = 0; i < 3; ++i)
                 DoSummonAtRift(entry);
         }else DoSummonAtRift(entry);
     }
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
index b6d08ee82d8..ac4de810a14 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
@@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance
 
                     if (!players.isEmpty())
                     {
-                        for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                        for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         {
                             if (Player* pPlayer = itr->getSource())
                             {
@@ -288,7 +288,6 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance
                         pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                         pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
 
-
                         if (Creature* pBoss = SummonedPortalBoss(pTemp))
                         {
                             if (pBoss->GetEntry() == C_AEONUS)
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
index 96e56462385..b00e017e816 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
@@ -167,7 +167,7 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI
 
         if (SleepTimer < diff)
         {
-            for(uint8 i=0;i<3; ++i)
+            for (uint8 i=0; i<3; ++i)
             {
                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,100,true))
                     target->CastSpell(target,SPELL_SLEEP,true);
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
index fa4c779d9b8..bcbacacbf90 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
@@ -308,7 +308,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())
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
index d3f87daec28..e1d65ff90a4 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
@@ -153,7 +153,7 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI
             m_creature->CastCustomSpell(m_creature, SPELL_MARK, NULL, NULL, NULL, false, NULL, NULL, m_creature->GetGUID());
 
             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 && target->getPowerType() == POWER_MANA)
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
index eb6e72452c0..5c0ade83bb9 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
@@ -43,7 +43,6 @@ EndContentData */
 
 #define GOSSIP_ITEM_GM1             "[GM] Toggle Debug Timers"
 
-
 CreatureAI* GetAI_npc_jaina_proudmoore(Creature* pCreature)
 {
     hyjalAI* ai = new hyjalAI(pCreature);
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
index e8bf7d8ceeb..94bce54f506 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp
@@ -58,7 +58,6 @@ float JainaDummySpawn[2][4]=
     {5484.98, -2721.69, 1483.39, 6.00656}
 };
 
-
 // Locations for summoning waves in Horde base
 float HordeBase[4][3]=
 {
@@ -314,7 +313,7 @@ hyjalAI::hyjalAI(Creature *c) : npc_escortAI(c), Summons(m_creature)
     pInstance = c->GetInstanceData();
     VeinsSpawned[0] = false;
     VeinsSpawned[1] = false;
-    for(uint8 i=0;i<14; ++i)
+    for (uint8 i=0; i<14; ++i)
         VeinGUID[i] = 0;
     InfernalCount = 0;
     TeleportTimer = 1000;
@@ -384,15 +383,12 @@ void hyjalAI::Reset()
     bRetreat = false;
     Debug = false;
 
-
     //Flags
     m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
 
     //Initialize spells
     memset(Spell, 0, sizeof(Spell));
 
-
-
     //Reset Instance Data for trash count
     if (pInstance)
     {
@@ -427,7 +423,7 @@ void hyjalAI::EnterEvadeMode()
 void hyjalAI::EnterCombat(Unit *who)
 {
     if (IsDummy)return;
-    for(uint8 i = 0; i < 3; ++i)
+    for (uint8 i = 0; i < 3; ++i)
         if (Spell[i].Cooldown)
             SpellTimer[i] = Spell[i].Cooldown;
 
@@ -447,7 +443,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
     uint32 random = rand()%4;
     float SpawnLoc[3];
 
-    for(uint8 i = 0; i < 3; ++i)
+    for (uint8 i = 0; i < 3; ++i)
     {
         SpawnLoc[i] = Base[random][i];
     }
@@ -540,7 +536,7 @@ void hyjalAI::SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3])
     InfernalCount = 0;//reset infernal count every new wave
 
     EnemyCount = pInstance->GetData(DATA_TRASH);
-    for(uint8 i = 0; i < 18; ++i)
+    for (uint8 i = 0; i < 18; ++i)
     {
         if (wave[Count].Mob[i])
             SummonCreature(wave[Count].Mob[i], Base);
@@ -616,7 +612,7 @@ uint32 hyjalAI::GetInstanceData(uint32 Event)
 void hyjalAI::Talk(uint32 id)
 {
     std::list<uint8> index;
-    for(uint8 i = 0; i < 9; ++i)
+    for (uint8 i = 0; i < 9; ++i)
     {
         if (Faction == 0)                                    // Alliance
         {
@@ -760,7 +756,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
                     m_creature->SetVisibility(VISIBILITY_OFF);
                     HideNearPos(m_creature->GetPositionX(), m_creature->GetPositionY());
                     HideNearPos(5037.76, -1889.71);
-                    for(uint8 i = 0; i < 92; ++i)//summon fires
+                    for (uint8 i = 0; i < 92; ++i)//summon fires
                         m_creature->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0);
 
                 }
@@ -773,7 +769,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
                     HideNearPos(m_creature->GetPositionX(), m_creature->GetPositionY());
                     HideNearPos(5563, -2763.19);
                     HideNearPos(5542.2, -2629.36);
-                    for(uint8 i = 0; i < 65; ++i)//summon fires
+                    for (uint8 i = 0; i < 65; ++i)//summon fires
                         m_creature->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0);
 
                 }
@@ -850,7 +846,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
 
     if (CheckTimer < diff)
     {
-        for(uint8 i = 0; i < 2; ++i)
+        for (uint8 i = 0; i < 2; ++i)
         {
             if (BossGUID[i])
             {
@@ -882,7 +878,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
     if (!UpdateVictim())
         return;
 
-    for(uint8 i = 0; i < 3; ++i)
+    for (uint8 i = 0; i < 3; ++i)
     {
         if (Spell[i].SpellId)
         {
@@ -954,7 +950,7 @@ void hyjalAI::HideNearPos(float x, float y)
 
     if (!creatures.empty())
     {
-        for(std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
+        for (std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
         {
             (*itr)->SetVisibility(VISIBILITY_OFF);
             (*itr)->setFaction(35);//make them friendly so mobs won't attack them
@@ -1013,7 +1009,7 @@ void hyjalAI::WaypointReached(uint32 i)
 
         if (!creatures.empty())
         {
-            for(std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
+            for (std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
             {
                 if ((*itr) && (*itr)->isAlive() && (*itr) != m_creature && (*itr)->GetEntry() != JAINA)
                 {
@@ -1055,7 +1051,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
 
             if (!creatures.empty())
             {
-                for(std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
+                for (std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
                 {
                     if ((*itr) && (*itr)->isAlive())
                     {
@@ -1079,10 +1075,10 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
     switch(faction)
     {
         case 0://alliance
-            for(uint8 i = 0; i < 92; ++i)//summon fires
+            for (uint8 i = 0; i < 92; ++i)//summon fires
                 m_creature->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0);
 
-            for(uint8 i = 0; i < 25; ++i)//summon 25 ghouls
+            for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls
             {
                 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);
@@ -1094,7 +1090,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
                     pUnit->setActive(true);
                 }
             }
-            for(uint8 i = 0; i < 3; ++i)//summon 3 abominations
+            for (uint8 i = 0; i < 3; ++i)//summon 3 abominations
             {
                 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);
@@ -1106,7 +1102,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
                     pUnit->setActive(true);
                 }
             }
-            for(uint8 i = 0; i < 5; ++i)//summon 5 gargoyles
+            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)
@@ -1120,10 +1116,10 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
             }
             break;
         case 1://horde
-            for(uint8 i = 0; i < 65; ++i)//summon fires
+            for (uint8 i = 0; i < 65; ++i)//summon fires
                 m_creature->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0);
 
-            for(uint8 i = 0; i < 26; ++i)//summon infernals
+            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)
@@ -1135,7 +1131,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
                     pUnit->setActive(true);
                 }
             }
-            for(uint8 i = 0; i < 25; ++i)//summon 25 ghouls
+            for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls
             {
                 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);
@@ -1147,7 +1143,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
                     pUnit->setActive(true);
                 }
             }
-            for(uint8 i = 0; i < 5; ++i)//summon 5 abominations
+            for (uint8 i = 0; i < 5; ++i)//summon 5 abominations
             {
                 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);
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
index 705039a6d09..9fb4ba90b19 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
@@ -179,7 +179,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
             }
             if (m_creature->GetEntry() == ABOMINATION)
             {
-                for(uint8 i = 0; i < 4; ++i)
+                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)
                 {
@@ -228,7 +228,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
                         Start(true, true);
                         break;
                     default:
-                        for(uint8 i = 22; i < 36; ++i)
+                        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]);
 
                         SetDespawnAtEnd(true);
@@ -239,7 +239,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
             }
             if (m_creature->GetEntry() == GHOUL)
             {
-                for(uint8 i = 0; i < 4; ++i)
+                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)
                 {
@@ -301,7 +301,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
                         Start(true, true);
                         break;
                     default:
-                        for(uint8 i = 22; i < 36; ++i)
+                        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]);
                         SetDespawnAtEnd(true);
                         LastOverronPos = 17;
@@ -314,7 +314,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
         {
             if (m_creature->GetEntry() == GHOUL)
             {
-                for(uint8 i = 0; i < 6; ++i)
+                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)
                 {
@@ -339,7 +339,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
                         Start(true, true);
                         break;
                     default:
-                        for(uint8 i = 0; i < 16; ++i)
+                        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]);
                         SetDespawnAtEnd(true);
                         LastOverronPos = 21;
@@ -349,9 +349,9 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
             }
             if (m_creature->GetEntry() == ABOMINATION)
             {
-                for(uint8 i = 0; i < 6; ++i)
+                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)
+                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]);
                 SetDespawnAtEnd(true);
                 LastOverronPos = 21;
@@ -497,7 +497,6 @@ struct mob_giant_infernalAI : public hyjal_trashAI
     }
 };
 
-
 CreatureAI* GetAI_mob_giant_infernal(Creature* pCreature)
 {
     return new mob_giant_infernalAI(pCreature);
@@ -593,7 +592,6 @@ struct mob_abominationAI : public hyjal_trashAI
     }
 };
 
-
 CreatureAI* GetAI_mob_abomination(Creature* pCreature)
 {
     return new mob_abominationAI(pCreature);
@@ -693,7 +691,6 @@ struct mob_ghoulAI : public hyjal_trashAI
     }
 };
 
-
 CreatureAI* GetAI_mob_ghoul(Creature* pCreature)
 {
     return new mob_ghoulAI(pCreature);
@@ -812,7 +809,6 @@ struct mob_necromancerAI : public hyjal_trashAI
     }
 };
 
-
 CreatureAI* GetAI_mob_necromancer(Creature* pCreature)
 {
     return new mob_necromancerAI(pCreature);
@@ -913,7 +909,6 @@ struct mob_bansheeAI : public hyjal_trashAI
     }
 };
 
-
 CreatureAI* GetAI_mob_banshee(Creature* pCreature)
 {
     return new mob_bansheeAI(pCreature);
@@ -999,7 +994,6 @@ struct mob_crypt_fiendAI : public hyjal_trashAI
     }
 };
 
-
 CreatureAI* GetAI_mob_crypt_fiend(Creature* pCreature)
 {
     return new mob_crypt_fiendAI(pCreature);
@@ -1085,7 +1079,6 @@ struct mob_fel_stalkerAI : public hyjal_trashAI
     }
 };
 
-
 CreatureAI* GetAI_mob_fel_stalker(Creature* pCreature)
 {
     return new mob_fel_stalkerAI(pCreature);
@@ -1196,7 +1189,6 @@ struct mob_frost_wyrmAI : public hyjal_trashAI
     }
 };
 
-
 CreatureAI* GetAI_mob_frost_wyrm(Creature* pCreature)
 {
     return new mob_frost_wyrmAI(pCreature);
@@ -1330,7 +1322,6 @@ struct mob_gargoyleAI : public hyjal_trashAI
     }
 };
 
-
 CreatureAI* GetAI_mob_gargoyle(Creature* pCreature)
 {
     return new mob_gargoyleAI(pCreature);
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
index 17fdbad5fda..d2272b72c16 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
@@ -32,4 +32,4 @@ struct TRINITY_DLL_DECL hyjal_trashAI : public npc_escortAI
 
     //private:
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
index 81b51507463..fc4c7485357 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
@@ -61,7 +61,6 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
 
     uint32 Trash;
 
-
     uint32 hordeRetreat;
     uint32 allianceRetreat;
     bool ArchiYell;
@@ -98,7 +97,7 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
@@ -221,7 +220,7 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
                 {
                     if (!m_uiAncientGemGUID.empty())
                     {
-                        for(std::list<uint64>::iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr)
+                        for (std::list<uint64>::iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr)
                         {
                             //don't know how long it expected
                             DoRespawnGameObject(*itr,DAY);
@@ -302,7 +301,7 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
         OUT_LOAD_INST_DATA(in);
         std::istringstream loadStream(in);
         loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4] >> allianceRetreat >> hordeRetreat >> RaidDamage;
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             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;
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
index b8ec8f2e111..c8484765504 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
@@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
 
         if (!players.isEmpty())
         {
-            for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+            for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
             {
                 if (Player* plr = itr->getSource())
                     return plr;
@@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
 
         if (!players.isEmpty())
         {
-            for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+            for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
             {
                 if (Player* pPlayer = itr->getSource())
                     pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER,0);
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
index 9fdd713e639..a3bfa20aee3 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
@@ -346,7 +346,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
                     Map::PlayerList const& players = pMap->GetPlayers();
                     if (!players.isEmpty() && pMap->IsDungeon())
                     {
-                        for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                        for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         {
                             if (Player* pPlayer = itr->getSource())
                                 pPlayer->KilledMonsterCredit(20156,m_creature->GetGUID());
@@ -364,7 +364,6 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
         }
     }
 
-
     void Reset()
     {
         LowHp = false;
diff --git a/src/bindings/scripts/scripts/kalimdor/moonglade.cpp b/src/bindings/scripts/scripts/kalimdor/moonglade.cpp
index 7e52c16b74d..fcbf822e4a0 100644
--- a/src/bindings/scripts/scripts/kalimdor/moonglade.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/moonglade.cpp
@@ -325,7 +325,7 @@ public:
             return;
         if (pPlayer->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
         {
-            for(uint8 i = 0; i < 41; ++i)
+            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]);
             }
diff --git a/src/bindings/scripts/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp b/src/bindings/scripts/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
index 3c635526d2e..559d013e1f3 100644
--- a/src/bindings/scripts/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
@@ -205,7 +205,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
             {
                 InitialSpawn = false;
 
-                for(uint32 i = 0; i < 10; ++i)
+                for (uint32 i = 0; i < 10; ++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);
@@ -265,7 +265,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
         if (Phase == 2)
         {
             uint32 max = rand()%10;
-            for(uint32 i = 0; i < max; ++i)
+            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);
@@ -279,7 +279,7 @@ struct TRINITY_DLL_DECL boss_onyxiaAI : public ScriptedAI
             uint32 max = rand() % 10 +1;
             if (max < 5)
             {
-                for(uint32 i = 0; i < max; ++i)
+                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);
diff --git a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/def_razorfen_kraul.h b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/def_razorfen_kraul.h
index d40abd7f2fd..e2219986f63 100644
--- a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/def_razorfen_kraul.h
+++ b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/def_razorfen_kraul.h
@@ -18,4 +18,4 @@
 #define DEF_RAZORFEN_KRAUL_H
 
 #define TYPE_WARD_KEEPERS       1
-#endif
\ No newline at end of file
+#endif
diff --git a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
index ed139ea45e9..4937e16d711 100644
--- a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
@@ -24,7 +24,6 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_razorfen_kraul.h"
 
-
 #define WARD_KEEPERS_NR 2
 
 struct TRINITY_DLL_DECL instance_razorfen_kraul : public ScriptedInstance
@@ -48,7 +47,7 @@ struct TRINITY_DLL_DECL instance_razorfen_kraul : public ScriptedInstance
 
         if (!players.isEmpty())
         {
-            for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+            for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
             {
                 if (Player* plr = itr->getSource())
                     return plr;
@@ -102,4 +101,4 @@ void AddSC_instance_razorfen_kraul()
     newscript->Name = "instance_razorfen_kraul";
     newscript->GetInstanceData = &GetInstanceData_instance_razorfen_kraul;
     newscript->RegisterSelf();
-}
\ No newline at end of file
+}
diff --git a/src/bindings/scripts/scripts/kalimdor/silithus.cpp b/src/bindings/scripts/scripts/kalimdor/silithus.cpp
index 45313fbbc73..2f62a8c5ca6 100644
--- a/src/bindings/scripts/scripts/kalimdor/silithus.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/silithus.cpp
@@ -919,7 +919,7 @@ struct TRINITY_DLL_DECL npc_anachronos_quest_triggerAI : public ScriptedAI
         uint8 KaldoreiSoldierCount = 0;
         uint8 AnubisathConquerorCount = 0;
         uint8 QirajiWaspCount = 0;
-        for(uint8 i = 0; i < 67; ++i)
+        for (uint8 i = 0; i < 67; ++i)
         {
             Creature* Spawn = NULL;
             float X = SpawnLocation[locIndex + i].x;
@@ -967,7 +967,7 @@ struct TRINITY_DLL_DECL npc_anachronos_quest_triggerAI : public ScriptedAI
 
             const Group::MemberSlotList members = EventGroup->GetMemberSlots();
 
-            for(Group::member_citerator itr = members.begin(); itr!= members.end(); itr++)
+            for (Group::member_citerator itr = members.begin(); itr!= members.end(); itr++)
             {
                 GroupMember = (Unit::GetPlayer(itr->guid));
                 if(!GroupMember)
diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
index d8ce45872e5..bd8888f4981 100644
--- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
@@ -235,7 +235,7 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI
             pInstance->SetData(DATA_BUG_TRIO_DEATH, 1);
         }
 
-        for(uint8 i = 0; i < 10; ++i)
+        for (uint8 i = 0; i < 10; ++i)
         {
             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);
diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
index 541d16b7f2b..f9de19ff92f 100644
--- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
@@ -567,7 +567,7 @@ struct TRINITY_DLL_DECL cthunAI : public ScriptedAI
 
                 if (!PlayerList.isEmpty())
                 {
-                    for(Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr)
                     {
                         if (Player* pPlr = itr->getSource())
                             pPlr->PlayDirectSound(RANDOM_SOUND_WHISPER,pPlr);
diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
index 0494cc2fdd1..57c9b302d0d 100644
--- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_sartura.cpp
@@ -35,7 +35,6 @@ EndScriptData */
 #define SPELL_WHIRLWINDADD                           26038
 #define SPELL_KNOCKBACK                              26027
 
-
 struct TRINITY_DLL_DECL boss_sarturaAI : public ScriptedAI
 {
     boss_sarturaAI(Creature *c) : ScriptedAI(c) {}
diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
index 72dfcdb08f3..b049fe25fa1 100644
--- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
@@ -320,7 +320,7 @@ struct TRINITY_DLL_DECL boss_twinemperorsAI : public ScriptedAI
 
         Creature *nearb = NULL;
 
-        for(std::list<Creature*>::iterator iter = lUnitList.begin(); iter != lUnitList.end(); ++iter)
+        for (std::list<Creature*>::iterator iter = lUnitList.begin(); iter != lUnitList.end(); ++iter)
         {
             Creature *c = *iter;
             if (c)
diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
index 04e31d7eebd..922c4b1454a 100644
--- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
@@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
         if (assistList.empty())
             return;
 
-        for(std::list<Creature*>::iterator iter = assistList.begin(); iter != assistList.end(); ++iter)
+        for (std::list<Creature*>::iterator iter = assistList.begin(); iter != assistList.end(); ++iter)
             AddBuddyToList((*iter));
     }
 
@@ -263,7 +263,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
     Unit *GetHatedManaUser()
     {
         std::list<HostilReference*>::iterator i;
-        for (i = m_creature->getThreatManager().getThreatList().begin();i != m_creature->getThreatManager().getThreatList().end(); ++i)
+        for (i = m_creature->getThreatManager().getThreatList().begin(); i != m_creature->getThreatManager().getThreatList().end(); ++i)
         {
             Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
             if (pUnit->getPowerType()==POWER_MANA)
diff --git a/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp b/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp
index 70e0b3e5e28..bf658ca97b2 100644
--- a/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/the_barrens.cpp
@@ -327,7 +327,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
         Wave = 0;
         PlayerGUID = 0;
 
-        for(uint8 i = 0; i < 6; ++i)
+        for (uint8 i = 0; i < 6; ++i)
         {
             AffrayChallenger[i] = 0;
             Challenger_down[i] = false;
@@ -366,7 +366,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
                 DoScriptText(SAY_TWIGGY_FLATHEAD_DOWN, m_creature);
                 pWarrior->FailQuest(1719);
 
-                for(uint8 i = 0; i < 6; ++i)
+                for (uint8 i = 0; i < 6; ++i)
                 {
                     if (AffrayChallenger[i])
                     {
@@ -407,7 +407,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
                     pWarrior->AreaExploredOrEventHappens(1719);
                     DoScriptText(SAY_TWIGGY_FLATHEAD_BEGIN, m_creature);
 
-                    for(uint8 i = 0; i < 6; ++i)
+                    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)
@@ -427,7 +427,7 @@ struct TRINITY_DLL_DECL npc_twiggy_flatheadAI : public ScriptedAI
             {
                 if (Challenger_checker < diff)
                 {
-                    for(uint8 i = 0; i < 6; ++i)
+                    for (uint8 i = 0; i < 6; ++i)
                     {
                         if (AffrayChallenger[i])
                         {
diff --git a/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp b/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp
index 9616aa4acf6..d8a7f3a91db 100644
--- a/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp
@@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL npc_kanatiAI : public npc_escortAI
 
     void DoSpawnGalak()
     {
-        for(int i = 0; i < 3; ++i)
+        for (int i = 0; i < 3; ++i)
             m_creature->SummonCreature(NPC_GALAK_ASS,
             m_afGalakLoc[0], m_afGalakLoc[1], m_afGalakLoc[2], 0.0f,
             TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
@@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL npc_lakota_windsongAI : public npc_escortAI
 
     void DoSpawnBandits(int uiAmbushId)
     {
-        for(int i = 0; i < 2; ++i)
+        for (int i = 0; i < 2; ++i)
             m_creature->SummonCreature(NPC_GRIM_BANDIT,
             m_afBanditLoc[i+uiAmbushId][0], m_afBanditLoc[i+uiAmbushId][1], m_afBanditLoc[i+uiAmbushId][2], 0.0f,
             TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
@@ -230,7 +230,7 @@ struct TRINITY_DLL_DECL npc_paoka_swiftmountainAI : public npc_escortAI
 
     void DoSpawnWyvern()
     {
-        for(int i = 0; i < 3; ++i)
+        for (int i = 0; i < 3; ++i)
             m_creature->SummonCreature(NPC_WYVERN,
             m_afWyvernLoc[i][0], m_afWyvernLoc[i][1], m_afWyvernLoc[i][2], 0.0f,
             TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
diff --git a/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp b/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp
index eac657fd727..ac717892794 100644
--- a/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp
@@ -44,7 +44,6 @@ EndContentData */
 #define ENTRY_TARLORD1 6519
 #define ENTRY_STOMPER 6513
 
-
 struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI
 {
     npc_ameAI(Creature *c) : npc_escortAI(c) {}
diff --git a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
index d955226e1c3..480272c6376 100644
--- a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
@@ -118,7 +118,7 @@ struct TRINITY_DLL_DECL instance_wailing_caverns : public ScriptedInstance
         loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
         >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6] >> m_auiEncounter[7] >> m_auiEncounter[8];
 
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] != DONE)
                 m_auiEncounter[i] = NOT_STARTED;
 
@@ -139,4 +139,4 @@ void AddSC_instance_wailing_caverns()
     newscript->Name = "instance_wailing_caverns";
     newscript->GetInstanceData = &GetInstanceData_instance_wailing_caverns;
     newscript->RegisterSelf();
-}
\ No newline at end of file
+}
diff --git a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
index d734e32d13b..4985746d8fc 100644
--- a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
@@ -261,7 +261,7 @@ struct TRINITY_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI
                                     if (pMap && pMap->IsDungeon())
                                     {
                                         Map::PlayerList const &players = pMap->GetPlayers();
-                                        for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                                        for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                                             itr->getSource()->CompletedAchievement(AchievWC);
                                     }
                                 }
diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
index 35827c0aac1..0621aa34844 100644
--- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
@@ -69,7 +69,6 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI
     uint32 guard_spawn_Timer;
     uint32 enrage_Timer;
 
-
     ScriptedInstance *pInstance;
 
     void Reset()
@@ -116,7 +115,7 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI
                 if (pMap && pMap->IsDungeon())
                 {
                     Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievRespectYourElders);
                 }
             }
diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
index 33c3ba42011..72023225dbe 100644
--- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp
@@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL boss_volazjAI : public ScriptedAI
         if (HeroicMode && uiEncounterTimer < 120000 && pMap && pMap->IsDungeon() && AchievQuickDemise)
         {
             Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievQuickDemise);
         }
     }
diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
index b6b1ac586eb..7f124077f86 100644
--- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp
@@ -212,7 +212,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI
                         Unit *target = NULL;
                         std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
                         std::vector<Unit *> target_list;
-                        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)
                         {
                             target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
                             // exclude pets & totems
@@ -268,10 +268,10 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI
             {
                 Map::PlayerList const &players = pMap->GetPlayers();
                 uint8 count = 0;
-                for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                   ++count;
                 if (count < 5)
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievThePartyIsOver);
             }
         }
diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
index c8a0fc22c3c..f682368c4f8 100644
--- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
@@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance
          Herald_Volazj =0;
          Amanitar =0;
 
-         for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+         for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
              m_auiEncounter[i] = NOT_STARTED;
         spheres[0] = NOT_STARTED;
         spheres[1] = NOT_STARTED;
@@ -69,13 +69,12 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
     }
 
-
     void OnCreatureCreate(Creature* pCreature, bool add)
     {
         switch(pCreature->GetEntry())
@@ -217,7 +216,7 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance
             m_auiEncounter[3] = data3;
             m_auiEncounter[4] = data4;
 
-            for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
                 if (m_auiEncounter[i] == IN_PROGRESS)
                     m_auiEncounter[i] = NOT_STARTED;
 
diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
index 377a9d58c8f..abb4fc6c7cb 100644
--- a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp
@@ -154,7 +154,6 @@ struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI
         if (!UpdateVictim())
             return;
 
-
         if(SummonTimer < diff)
         {
             Summon();
@@ -201,7 +200,7 @@ struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI
                 HeroicMode && pMap && pMap->IsDungeon() && AchievWatchHimDie)
             {
                 Map::PlayerList const &players = pMap->GetPlayers();
-                for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                     itr->getSource()->CompletedAchievement(AchievWatchHimDie);
             }
         }
@@ -357,7 +356,6 @@ struct TRINITY_DLL_DECL npc_watcher_gashraAI : public ScriptedAI
         InfectedBiteTimer = 4000;
     }
 
-
     void EnterCombat(Unit* who)
     {
         m_creature->CastSpell(m_creature,SPELL_ENRAGE,true);
@@ -513,7 +511,6 @@ CreatureAI* GetAI_npc_watcher_silthik (Creature* pCreature)
     return new npc_watcher_silthikAI (pCreature);
 }
 
-
 void AddSC_boss_krik_thir()
 {
     Script *newscript;
diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
index d06335bdbd3..87d0b854821 100644
--- a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
+++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
@@ -64,13 +64,12 @@ struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
     }
 
-
     void OnCreatureCreate(Creature* pCreature, bool add)
     {
         switch(pCreature->GetEntry())
@@ -182,7 +181,7 @@ struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance
             m_auiEncounter[1] = data1;
             m_auiEncounter[2] = data2;
 
-            for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
                 if (m_auiEncounter[i] == IN_PROGRESS)
                     m_auiEncounter[i] = NOT_STARTED;
 
diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp
index 2f07378c992..963e42f82aa 100644
--- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp
+++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp
@@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI
                 if (pMap && pMap->IsDungeon())
                 {
                     Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievOhNovos);
                 }
             }
diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp
index 4b498223838..75eee1caba2 100644
--- a/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp
+++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/instance_drak_tharon_keep.cpp
@@ -41,7 +41,7 @@ struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
@@ -177,7 +177,7 @@ struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance
             m_auiEncounter[2] = data2;
             m_auiEncounter[3] = data3;
 
-            for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
                 if (m_auiEncounter[i] == IN_PROGRESS)
                     m_auiEncounter[i] = NOT_STARTED;
         }else OUT_LOAD_INST_DATA_FAIL;
diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp
index a352310a78d..d16d86ab4b9 100644
--- a/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp
+++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp
@@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI
                 if (pMap && pMap->IsDungeon())
                 {
                     Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievLessRabi);
                 }
             }
diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp
index 95f74af7e35..7a2da670478 100644
--- a/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp
+++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp
@@ -130,10 +130,10 @@ struct TRINITY_DLL_DECL boss_slad_ranAI : public ScriptedAI
             if(uiSpawnTimer < diff)
             {
                 if (uiPhase == 1)
-                    for (uint8 i = 0;i < (HeroicMode ? 5 : 3); ++i)
+                    for (uint8 i = 0; i < (HeroicMode ? 5 : 3); ++i)
                         m_creature->SummonCreature(CREATURE_SNAKE, SpawnLoc[i].x, SpawnLoc[i].y, SpawnLoc[i].z, SpawnLoc[i].orientation, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000);
                 if (uiPhase == 2)
-                    for (uint8 i = 0;i < (HeroicMode ? 5 : 3); ++i)
+                    for (uint8 i = 0; i < (HeroicMode ? 5 : 3); ++i)
                         m_creature->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i].x, SpawnLoc[i].y, SpawnLoc[i].z, SpawnLoc[i].orientation, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000);
                 uiSpawnTimer = 5000;
             } else uiSpawnTimer -= diff;
diff --git a/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp b/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp
index 3b8dd7edea2..9a7a6b7a97d 100644
--- a/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp
+++ b/src/bindings/scripts/scripts/northrend/gundrak/instance_gundrak.cpp
@@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance
 
    bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
@@ -260,7 +260,7 @@ struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance
             m_auiEncounter[3] = data3;
             m_auiEncounter[4] = data4;
 
-            for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
                 if (m_auiEncounter[i] == IN_PROGRESS)
                     m_auiEncounter[i] = NOT_STARTED;
         }else OUT_LOAD_INST_DATA_FAIL;
diff --git a/src/bindings/scripts/scripts/northrend/howling_fjord.cpp b/src/bindings/scripts/scripts/northrend/howling_fjord.cpp
index cabb00d748f..27ba213e798 100644
--- a/src/bindings/scripts/scripts/northrend/howling_fjord.cpp
+++ b/src/bindings/scripts/scripts/northrend/howling_fjord.cpp
@@ -158,7 +158,6 @@ struct TRINITY_DLL_DECL npc_plaguehound_trackerAI : public npc_escortAI
 {
     npc_plaguehound_trackerAI(Creature* pCreature) : npc_escortAI(pCreature) { }
 
-
     void Reset()
     {
         InitScriptData();
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp
index a39e76a24b6..b051b956e66 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp
@@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_four_horsemenAI : public BossAI
     boss_four_horsemenAI(Creature *c) : BossAI(c, BOSS_HORSEMEN)
     {
         id = Horsemen(0);
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
             if (me->GetEntry() == MOB_HORSEMEN[i])
                 id = Horsemen(i);
         caster = (id == HORSEMEN_LADY || id == HORSEMEN_SIR);
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp
index ed38cbe62c4..2e121e54b1a 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp
@@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL boss_gluthAI : public BossAI
 
     void EnterCombat(Unit *who)
     {
-        for(uint32 i = 0; i < 3; ++i)
+        for (uint32 i = 0; i < 3; ++i)
             if (Creature *trigger = DoSummon(WORLD_TRIGGER, PosSummon[i]))
                 triggers.push_back(trigger);
         if (triggers.size() < 3)
@@ -126,7 +126,7 @@ struct TRINITY_DLL_DECL boss_gluthAI : public BossAI
                     DoCast(me, SPELL_BERSERK);
                     return;
                 case EVENT_SUMMON:
-                    for(uint32 i = 0; i < HEROIC(1,2); ++i)
+                    for (uint32 i = 0; i < HEROIC(1,2); ++i)
                         DoSummon(MOB_ZOMBIE, triggers[rand()%3]);
                     events.ScheduleEvent(EVENT_SUMMON, 10000);
                     return;
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
index 647c62a32eb..aa67e6edeb2 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
@@ -120,10 +120,10 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
 
     void EnterCombat(Unit *who)
     {
-        for(uint32 i = 0; i < POS_LIVE; ++i)
+        for (uint32 i = 0; i < POS_LIVE; ++i)
             if (Creature *trigger = DoSummon(WORLD_TRIGGER, PosSummonLive[i]))
                 liveTrigger.push_back(trigger);
-        for(uint32 i = 0; i < POS_DEAD; ++i)
+        for (uint32 i = 0; i < POS_DEAD; ++i)
             if (Creature *trigger = DoSummon(WORLD_TRIGGER, PosSummonDead[i]))
                 deadTrigger.push_back(trigger);
 
@@ -160,7 +160,7 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
     {
         if (summon->GetEntry() == WORLD_TRIGGER)
         {
-            //for(TriggerVct::iterator itr = liveTrigger.begin(); itr != liveTrigger.end(); ++itr)
+            //for (TriggerVct::iterator itr = liveTrigger.begin(); itr != liveTrigger.end(); ++itr)
             //    if(*itr == summon)
             error_log("boss_gothikAI: trigger is despawned!");
             EnterEvadeMode();
@@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
                 case EVENT_SUMMON:
                     if (waves[waveCount].entry)
                     {
-                        for(uint32 i = 0; i < waves[waveCount].number; ++i)
+                        for (uint32 i = 0; i < waves[waveCount].number; ++i)
                             DoSummon(waves[waveCount].entry, liveTrigger[rand()%POS_LIVE], 1.0f);
                         events.ScheduleEvent(EVENT_SUMMON, waves[waveCount].time);
                         ++waveCount;
@@ -312,7 +312,7 @@ struct TRINITY_DLL_DECL mob_gothik_minionAI : public CombatAI
         if (pMap->IsDungeon())
         {
             Map::PlayerList const &PlayerList = pMap->GetPlayers();
-            for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+            for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
             {
                 if (i->getSource()->isAlive() && SIDE_CHECK(i->getSource()))
                 {
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp
index 2e395ecec03..e5b86e59193 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp
@@ -236,7 +236,7 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI
                     {
                         std::vector<Unit*> unitList;
                         std::list<HostilReference*> *threatList = &me->getThreatManager().getThreatList();
-                        for(std::list<HostilReference*>::const_iterator itr = threatList->begin(); itr != threatList->end(); ++itr)
+                        for (std::list<HostilReference*>::const_iterator itr = threatList->begin(); itr != threatList->end(); ++itr)
                         {
                             if ((*itr)->getTarget()->GetTypeId() == TYPEID_PLAYER
                                 && (*itr)->getTarget()->getPowerType() == POWER_MANA
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp
index ff84d1077e4..f1209f3f948 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp
@@ -74,7 +74,7 @@ struct TRINITY_DLL_DECL boss_maexxnaAI : public BossAI
             switch(eventId)
             {
                 case EVENT_WRAP:
-                    for(uint32 i = 0; i < HEROIC(1,2); ++i)
+                    for (uint32 i = 0; i < HEROIC(1,2); ++i)
                     {
                         if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP))
                         {
@@ -105,7 +105,7 @@ struct TRINITY_DLL_DECL boss_maexxnaAI : public BossAI
                 case EVENT_SUMMON:
                 {
                     uint32 amount = 8+rand()%2;
-                    for(uint32 i = 0; i < amount; ++i)
+                    for (uint32 i = 0; i < amount; ++i)
                         DoSummon(MOB_SPIDERLING, me);
                     events.ScheduleEvent(EVENT_SUMMON, 40000);
                     break;
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp
index c4ba86a91d6..911ca8a39f7 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp
@@ -120,7 +120,7 @@ struct TRINITY_DLL_DECL boss_nothAI : public BossAI
 
     void SummonUndead(uint32 entry, uint32 num)
     {
-        for(uint32 i = 0; i < num; ++i)
+        for (uint32 i = 0; i < num; ++i)
         {
             uint32 pos = rand()%MAX_SUMMON_POS;
             me->SummonCreature(entry, SummonPos[pos][0], SummonPos[pos][1], SummonPos[pos][2],
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp
index 5077f0267ed..3686d859bc8 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_patchwerk.cpp
@@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL boss_patchwerkAI : public BossAI
                 if(pMap && pMap->IsDungeon())
                 {
                     Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievMakeQuickWerkOfHim);
                 }
             }
@@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL boss_patchwerkAI : public BossAI
                     uint32 MostHP = 0;
                     Unit* pMostHPTarget = NULL;
                     std::list<HostilReference*>::iterator i = me->getThreatManager().getThreatList().begin();
-                    for(; i != me->getThreatManager().getThreatList().end(); ++i)
+                    for (; i != me->getThreatManager().getThreatList().end(); ++i)
                     {
                         Unit* target = (*i)->getTarget();
                         if (target->isAlive() && target->GetHealth() > MostHP && me->IsWithinMeleeRange(target))
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp
index e5fb1c6463a..e460627d648 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp
@@ -149,7 +149,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
                 if(pMap && pMap->IsDungeon())
                 {
                     Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievTheHundredClub);
                 }
             }
@@ -176,7 +176,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
         if(CanTheHundredClub && pMap && pMap->IsDungeon())
         {
             Map::PlayerList const &players = pMap->GetPlayers();
-            for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+            for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
             {
                 if(itr->getSource()->GetResistance(SPELL_SCHOOL_FROST) > MAX_FROST_RESISTANCE)
                 {
@@ -201,7 +201,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
 
     void ClearIceBlock()
     {
-        for(IceBlockMap::iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr)
+        for (IceBlockMap::iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr)
         {
             if (Player* pPlayer = Unit::GetPlayer(itr->first))
                 pPlayer->RemoveAura(SPELL_ICEBOLT);
@@ -291,7 +291,7 @@ 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)
+                        for (; i != me->getThreatManager().getThreatList().end(); ++i)
                             if ((*i)->getTarget()->GetTypeId() == TYPEID_PLAYER && !(*i)->getTarget()->HasAura(SPELL_ICEBOLT))
                                 targets.push_back((*i)->getTarget());
 
@@ -348,7 +348,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
         DoZoneInCombat(); // make sure everyone is in threatlist
         std::vector<Unit*> targets;
         std::list<HostilReference*>::iterator i = me->getThreatManager().getThreatList().begin();
-        for(; i != me->getThreatManager().getThreatList().end(); ++i)
+        for (; i != me->getThreatManager().getThreatList().end(); ++i)
         {
             Unit *target = (*i)->getTarget();
             if (target->GetTypeId() != TYPEID_PLAYER)
@@ -361,7 +361,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
                 continue;
             }
 
-            for(IceBlockMap::iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr)
+            for (IceBlockMap::iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr)
             {
                 if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second))
                 {
@@ -378,7 +378,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
 
         me->CastSpell(me, SPELL_FROST_EXPLOSION, true);
 
-        for(std::vector<Unit*>::iterator itr = targets.begin(); itr != targets.end(); ++itr)
+        for (std::vector<Unit*>::iterator itr = targets.begin(); itr != targets.end(); ++itr)
             (*itr)->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, false);
     }
 };
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp
index 173bb84dba7..7d023c253a3 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp
@@ -36,11 +36,9 @@
 //both
 #define SPELL_WARSTOMP          28125
 
-
  //generic
 #define C_TESLA_COIL                        16218           //the coils (emotes "Tesla Coil overloads!")
 
-
 //Thaddus
 #define SAY_GREET               -1533029 //not used
 #define SAY_AGGRO               RAND(-1533030,-1533031,-1533032)
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp
index 189eac62ca8..eff98fe289f 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/instance_naxxramas.cpp
@@ -89,7 +89,7 @@ inline uint32 GetEruptionSection(float x, float y)
         return 3;
 
     float slope = y/x;
-    for(uint32 i = 0; i < 3; ++i)
+    for (uint32 i = 0; i < 3; ++i)
         if (slope > HeiganEruptionSlope[i])
             return i;
     return 3;
@@ -170,12 +170,12 @@ struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData
 
     void HeiganErupt(uint32 section)
     {
-        for(uint32 i = 0; i < 4; ++i)
+        for (uint32 i = 0; i < 4; ++i)
         {
             if (i == section)
                 continue;
 
-            for(std::set<GameObject*>::iterator itr = HeiganEruption[i].begin(); itr != HeiganEruption[i].end(); ++itr)
+            for (std::set<GameObject*>::iterator itr = HeiganEruption[i].begin(); itr != HeiganEruption[i].end(); ++itr)
             {
                 (*itr)->SendCustomAnim();
                 (*itr)->CastSpell(NULL, SPELL_ERUPTION);
@@ -191,7 +191,7 @@ bool AreaTrigger_at_naxxramas_frostwyrm_wing(Player* pPlayer, AreaTriggerEntry *
 
     InstanceData *data = pPlayer->GetInstanceData();
     if (data)
-        for(uint32 i = BOSS_ANUBREKHAN; i < BOSS_SAPPHIRON; ++i)
+        for (uint32 i = BOSS_ANUBREKHAN; i < BOSS_SAPPHIRON; ++i)
             if (data->GetBossState(i) != DONE)
                 return true;
 
diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp
index f0759804235..3f37cca3893 100644
--- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp
@@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_anomalusAI : public ScriptedAI
                 if (pMap && pMap->IsDungeon())
                 {
                     Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievChaosTheory);
                 }
             }
diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp
index 4845119a89e..38bd1a7822b 100644
--- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp
@@ -110,7 +110,7 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI
                 if (pMap && pMap->IsDungeon())
                 {
                     Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievIntenseCold);
                 }
             }
@@ -136,7 +136,7 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI
 
         GameObject *ContainmentSpheres[CONTAINMENT_SPHERES];
 
-        for(uint8 i = 0; i < CONTAINMENT_SPHERES; ++i)
+        for (uint8 i = 0; i < CONTAINMENT_SPHERES; ++i)
         {
             ContainmentSpheres[i] = pInstance->instance->GetGameObject(ContainmentSphereGUIDs[i]);
             if (!ContainmentSpheres[i])
@@ -174,7 +174,7 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI
         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++)
+            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)
diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp
index d043705ab54..7b8fe60bacf 100644
--- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_magus_telestra.cpp
@@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI
                 if (pMap && pMap->IsDungeon())
                 {
                     Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievSplitPersonality);
                 }
             }
@@ -205,7 +205,6 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI
             return;
         }
 
-
         if ((Phase == 1)||(Phase == 3))
         {
             Unit* FireMagus;
diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/instance_nexus.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/instance_nexus.cpp
index c420cb1920d..b696012b776 100644
--- a/src/bindings/scripts/scripts/northrend/nexus/nexus/instance_nexus.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/instance_nexus.cpp
@@ -233,7 +233,7 @@ struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance
         std::istringstream loadStream(chrIn);
         loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
 
-        for(uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; ++i)
+        for (uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; ++i)
         {
             if (m_auiEncounter[i] == IN_PROGRESS)
                 m_auiEncounter[i] = NOT_STARTED;
diff --git a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_varos.cpp b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_varos.cpp
index 0ccd453e4d2..cfd419a01f8 100644
--- a/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_varos.cpp
+++ b/src/bindings/scripts/scripts/northrend/nexus/oculus/boss_varos.cpp
@@ -34,7 +34,6 @@ update creature_template set scriptname = '' where entry = '';
 #define SAY_STRIKE_3                           -1578028
 #define SAY_SPAWN                              -1578029
 
-
 struct TRINITY_DLL_DECL boss_varosAI : public ScriptedAI
 {
     boss_varosAI(Creature *c) : ScriptedAI(c) {}
diff --git a/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp b/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp
index 0a4421683a3..5e5e10530f2 100644
--- a/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp
+++ b/src/bindings/scripts/scripts/northrend/sholazar_basin.cpp
@@ -115,7 +115,6 @@ struct TRINITY_DLL_DECL npc_injured_rainspeaker_oracleAI : public npc_escortAI
     }
 };
 
-
 bool GossipHello_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature* pCreature)
 {
     if (pCreature->isQuestGiver())
@@ -215,7 +214,6 @@ bool GossipSelect_npc_vekjik(Player* pPlayer, Creature* pCreature, uint32 uiSend
     return true;
 }
 
-
 /*######
 ## avatar_of_freya
 ######*/
@@ -235,7 +233,6 @@ enum eFreya
     GOSSIP_TEXTID_AVATAR3    = 13305
 };
 
-
 bool GossipHello_npc_avatar_of_freya(Player* pPlayer, Creature* pCreature)
 {
     if (pCreature->isQuestGiver())
diff --git a/src/bindings/scripts/scripts/northrend/storm_peaks.cpp b/src/bindings/scripts/scripts/northrend/storm_peaks.cpp
index 473fca5aa71..ab55c2e1341 100644
--- a/src/bindings/scripts/scripts/northrend/storm_peaks.cpp
+++ b/src/bindings/scripts/scripts/northrend/storm_peaks.cpp
@@ -30,7 +30,6 @@ enum eAgnetta
     FACTION_HOSTILE_AT1             = 45
 };
 
-
 struct TRINITY_DLL_DECL npc_agnetta_tyrsdottarAI : public ScriptedAI
 {
     npc_agnetta_tyrsdottarAI(Creature* pCreature) : ScriptedAI(pCreature) { }
@@ -81,7 +80,6 @@ enum eFrostbornScout
     QUEST_MISSING_SCOUTS  =  12864
 };
 
-
 bool GossipHello_npc_frostborn_scout(Player* pPlayer, Creature* pCreature)
 {
 
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp
index d2630dc2175..aabb23349ff 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_bjarngrim.cpp
@@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI
         m_uiMortalStrike_Timer = 8000;
         m_uiSlam_Timer = 10000;
 
-        for(uint8 i = 0; i < 2; ++i)
+        for (uint8 i = 0; i < 2; ++i)
         {
             if (Creature* pStormforgedLieutenant = (Unit::GetCreature((*m_creature), m_auiStormforgedLieutenantGUID[i])))
             {
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp
index 96e49343b39..74df79e6211 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp
@@ -154,7 +154,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI
         if (m_lSparkGUIDList.empty())
             return;
 
-        for(std::list<uint64>::iterator itr = m_lSparkGUIDList.begin(); itr != m_lSparkGUIDList.end(); ++itr)
+        for (std::list<uint64>::iterator itr = m_lSparkGUIDList.begin(); itr != m_lSparkGUIDList.end(); ++itr)
         {
             if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr))
             {
@@ -173,7 +173,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI
         if (m_lSparkGUIDList.empty())
             return;
 
-        for(std::list<uint64>::iterator itr = m_lSparkGUIDList.begin(); itr != m_lSparkGUIDList.end(); ++itr)
+        for (std::list<uint64>::iterator itr = m_lSparkGUIDList.begin(); itr != m_lSparkGUIDList.end(); ++itr)
         {
             if (Creature* pSpark = Unit::GetCreature(*m_creature, *itr))
             {
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp
index 19d34eb383c..7f858f09cfe 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp
@@ -118,7 +118,7 @@ struct TRINITY_DLL_DECL boss_lokenAI : public ScriptedAI
                 if (pMap && pMap->IsDungeon())
                 {
                     Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievTimelyDeath);
                 }
             }
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
index 1804d316f92..a2aa5f293fc 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
@@ -154,7 +154,7 @@ struct TRINITY_DLL_DECL boss_volkhanAI : public ScriptedAI
                 if (pMap && pMap->IsDungeon())
                 {
                     Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievShatterResistant);
                 }
             }
@@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL boss_volkhanAI : public ScriptedAI
         if (m_lGolemGUIDList.empty())
             return;
 
-        for(std::list<uint64>::iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr)
+        for (std::list<uint64>::iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr)
         {
             if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr))
             {
@@ -188,7 +188,7 @@ struct TRINITY_DLL_DECL boss_volkhanAI : public ScriptedAI
         if (m_lGolemGUIDList.empty())
             return;
 
-        for(std::list<uint64>::iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr)
+        for (std::list<uint64>::iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr)
         {
             if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr))
             {
@@ -313,7 +313,7 @@ bool EffectDummyCreature_boss_volkhan(Unit* pCaster, uint32 uiSpellId, uint32 ui
         if (pCaster->GetEntry() != NPC_VOLKHAN_ANVIL || pCreatureTarget->GetEntry() != NPC_VOLKHAN)
             return true;
 
-        for(uint8 i = 0; i < MAX_GOLEM; ++i)
+        for (uint8 i = 0; i < MAX_GOLEM; ++i)
         {
             pCreatureTarget->CastSpell(pCaster, SPELL_SUMMON_MOLTEN_GOLEM, true);
         }
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
index f8fcd720dfa..d74a4a228eb 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp
@@ -141,7 +141,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI
         if (HeroicMode && AchievTimer < 60000 && pMap && pMap->IsDungeon() && AchievGoodGrief)
         {
             Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievGoodGrief);
         }
     }
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
index 69061ad1d1f..4f0aceaa866 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
@@ -190,7 +190,7 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI
                 if (pMap && pMap->IsDungeon())
                 {
                     Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievAbuseTheOoze);
                 }
             }
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp
index 0681b376f4e..6e6b0aef0c6 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp
@@ -155,7 +155,7 @@ struct TRINITY_DLL_DECL mob_tribuna_controllerAI : public ScriptedAI
         if (!lKaddrakGUIDList.empty())
         {
             uint32 uiPositionCounter = 0;
-            for(std::list<Creature*>::iterator itr = lKaddrakGUIDList.begin(); itr != lKaddrakGUIDList.end(); ++itr)
+            for (std::list<Creature*>::iterator itr = lKaddrakGUIDList.begin(); itr != lKaddrakGUIDList.end(); ++itr)
             {
                 if ((*itr)->isAlive())
                 {
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
index 85d9367ae1d..5960614eeff 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
@@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance
         uiTribunalChest = 0;
         uiTribunalSkyFloor = 0;
 
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             m_auiEncounter[i] = NOT_STARTED;
     }
 
@@ -219,7 +219,7 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance
             m_auiEncounter[2] = data2;
             m_auiEncounter[3] = data3;
 
-            for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
                 if (m_auiEncounter[i] == IN_PROGRESS)
                     m_auiEncounter[i] = NOT_STARTED;
 
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp
index df03ff9eff7..0b8d1e87b5c 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp
@@ -62,8 +62,6 @@ EndScriptData */
 #define SPELL_LIGHTNING_TENDRILS_H   63486
 #define SPELL_STORMSHIELD            64187
 
-
-
 enum eEnums
 {
     EVENT_ENRAGE,
@@ -87,14 +85,12 @@ enum eEnums
 
 };
 
-
-
 bool IsEncounterComplete(ScriptedInstance* pInstance, Creature* m_creature)
 {
    if (!pInstance || !m_creature)
         return false;
 
-    for(uint8 i = 0; i < 3; ++i)
+    for (uint8 i = 0; i < 3; ++i)
     {
         uint64 guid = pInstance->GetData64(DATA_STEELBREAKER+i);
         if(!guid)
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp
index 1aa70290b69..6179b19f0e2 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_flame_leviathan.cpp
@@ -20,7 +20,6 @@
 #include "def_ulduar.h"
 #include "Vehicle.h"
 
-
 #define SPELL_PURSUED           62374
 #define SPELL_GATHERING_SPEED   62375
 #define SPELL_BATTERING_RAM     62376
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp
index 8dfda95a987..38c662f5fe9 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp
@@ -91,7 +91,6 @@ struct TRINITY_DLL_DECL boss_ignis_AI : public BossAI
             SLAG_POT_Timer = 30000;
         } else SLAG_POT_Timer -= diff;
 
-
         DoMeleeAttackIfReady();
     }
 };
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp
index 92dd6ecacab..839fb14f95f 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp
@@ -218,7 +218,7 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public BossAI
             {
                 InitialSpawn = false;
 
-                for(uint32 i = 0; i < 4; ++i)
+                for (uint32 i = 0; i < 4; ++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);
@@ -227,7 +227,6 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public BossAI
                 }
             }
 
-
             if (FireballTimer < diff)
             {
                 DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_FIREBALL);
@@ -269,7 +268,7 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public BossAI
         if (Phase == 2)
         {
             uint32 max = rand()%10;
-            for(uint32 i = 0; i < 4; ++i)
+            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);
@@ -283,7 +282,7 @@ struct TRINITY_DLL_DECL boss_razorscaleAI : public BossAI
             uint32 max = rand() % 10 +1;
             if (max < 1)
             {
-                for(uint32 i = 0; i < max; ++i)
+                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);
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp
index 4a4c441fffc..b825bbcad23 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp
@@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL instance_ulduar : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
         {
             if (m_auiEncounter[i] == IN_PROGRESS)
                 return true;
@@ -204,7 +204,7 @@ struct TRINITY_DLL_DECL instance_ulduar : public ScriptedInstance
 
             std::ostringstream saveStream;
 
-            for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
                 saveStream << m_auiEncounter[i] << " ";
 
             m_strInstData = saveStream.str();
@@ -298,7 +298,7 @@ struct TRINITY_DLL_DECL instance_ulduar : public ScriptedInstance
 
         std::istringstream loadStream(strIn);
 
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
         {
             loadStream >> m_auiEncounter[i];
 
diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
index 86523ef0bf6..87f5eeec1d9 100644
--- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp
@@ -253,7 +253,6 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI
             }else Enrage_Timer -= diff;
         }
 
-
         if (Roar_Timer < diff)
         {
             if (!wait_Timer)
diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
index bff13c8b4cc..d5a5b3dcabd 100644
--- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp
@@ -154,7 +154,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI
                 if (pMap && pMap->IsDungeon())
                 {
                     Map::PlayerList const &players = pMap->GetPlayers();
-                    for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+                    for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                         itr->getSource()->CompletedAchievement(AchievOnTheRocks);
                 }
             }
@@ -197,7 +197,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI
             {
                 Creature* Skeleton;
                 DoScriptText(SAY_SKELETONS, m_creature);
-                for(uint8 i = 0; i < 5; ++i)
+                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)
@@ -267,7 +267,6 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI
         }
     }
 
-
     void PretendToDie()
     {
         isDead = true;
diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
index 0770f9209e9..dcb222e163c 100644
--- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp
@@ -224,7 +224,6 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI
     uint32 AggroYell_Timer;
     bool Skarvald_isDead;
 
-
     void Reset()
     {
         ShadowBolt_Timer = 1000;
diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
index 744891371a9..be4446dd6d4 100644
--- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
@@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
         Dalronn = 0;
         Ingvar = 0;
 
-        for(uint8 i = 0; i < 3; ++i)
+        for (uint8 i = 0; i < 3; ++i)
         {
             forge_bellow[i] = 0;
             forge_fire[i] = 0;
@@ -90,7 +90,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
@@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
 
         if (!players.isEmpty())
         {
-            for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+            for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
             {
                 if (Player* plr = itr->getSource())
                 return plr;
@@ -229,7 +229,6 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
             break;
         }
 
-
         if (data == DONE)
         {
             SaveToDB();
@@ -284,7 +283,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
             m_auiEncounter[1] = data1;
             m_auiEncounter[2] = data2;
 
-            for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
                 if (m_auiEncounter[i] == IN_PROGRESS)
                     m_auiEncounter[i] = NOT_STARTED;
 
diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp
index 6dd5b242517..2a0fb5642bb 100644
--- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/utgarde_keep.cpp
@@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL npc_dragonflayer_forge_masterAI : public ScriptedAI
         float diff = 30.0f;
         int near_f = 0;
 
-        for(uint8 i = 0; i < 3 ; ++i)
+        for (uint8 i = 0; i < 3 ; ++i)
         {
             GameObject* temp;
             temp = m_creature->FindNearestGameObject(entry_search[i],30);
diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
index 4710d8dec82..f389b2e99ab 100644
--- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
@@ -217,7 +217,7 @@ struct TRINITY_DLL_DECL boss_skadiAI : public ScriptedAI
     void SpawnMobs(uint32 spot)
     {
         uint8 uiMaxSpawn = (HeroicMode ? 6 : 5);
-        for(uint8 i = 0; i < uiMaxSpawn; ++i)
+        for (uint8 i = 0; i < uiMaxSpawn; ++i)
         {
             Creature* pTemp;
             switch (rand()%3)
diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
index df72278c684..fce4ad3f5e7 100644
--- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_ymiron.cpp
@@ -275,7 +275,7 @@ struct TRINITY_DLL_DECL boss_ymironAI : public ScriptedAI
                 x = m_creature->GetPositionX()-5;
                 y = m_creature->GetPositionY()-5;
                 z = m_creature->GetPositionZ();
-                for(uint8 i = 0; i < 4; ++i)
+                for (uint8 i = 0; i < 4; ++i)
                 {
                     //DoCast(m_creature, SPELL_SUMMON_AVENGING_SPIRIT); // works fine, but using summon has better control
                     if (Creature* pTemp = m_creature->SummonCreature(CREATURE_AVENGING_SPIRIT, x+rand()%10, y+rand()%10, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000))
diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
index 7eb661668df..23c530f2432 100644
--- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
+++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/instance_pinnacle.cpp
@@ -40,13 +40,13 @@ struct TRINITY_DLL_DECL instance_pinnacle : public ScriptedInstance
 
     void Initialize()
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
            m_auiEncounter[i] = NOT_STARTED;
     }
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
@@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL instance_pinnacle : public ScriptedInstance
             m_auiEncounter[2] = data2;
             m_auiEncounter[3] = data3;
 
-            for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
                 if (m_auiEncounter[i] == IN_PROGRESS)
                     m_auiEncounter[i] = NOT_STARTED;
 
diff --git a/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp
index 0f240bd8692..6b9586560a0 100644
--- a/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp
+++ b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp
@@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
     {
         if(!MinionList.empty())
         {
-            for(std::list<uint64>::const_iterator itr = MinionList.begin(); itr != MinionList.end(); itr++)
+            for (std::list<uint64>::const_iterator itr = MinionList.begin(); itr != MinionList.end(); itr++)
             {
                 Creature *Minion = Unit::GetCreature(*m_creature, *itr);
                 if(Minion && Minion->isAlive())
@@ -100,7 +100,7 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
     {
         if(!MinionList.empty())
         {
-            for(std::list<uint64>::const_iterator itr = MinionList.begin(); itr != MinionList.end(); ++itr)
+            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->getVictim())
diff --git a/src/bindings/scripts/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp b/src/bindings/scripts/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp
index 45d0a4be7ae..dc9b78e825f 100644
--- a/src/bindings/scripts/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp
+++ b/src/bindings/scripts/scripts/northrend/vault_of_archavon/instance_vault_of_archavon.cpp
@@ -22,13 +22,13 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
         Archavon = 0;
         Emalon = 0;
 
-        for(uint8 i = 0; i < ENCOUNTERS; i++)
+        for (uint8 i = 0; i < ENCOUNTERS; i++)
             Encounters[i] = NOT_STARTED;
     }
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < ENCOUNTERS; i++)
+        for (uint8 i = 0; i < ENCOUNTERS; i++)
             if(Encounters[i] == IN_PROGRESS) return true;
 
         return false;
@@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
         OUT_LOAD_INST_DATA(in);
         std::istringstream stream(in);
         stream >> Encounters[0] >> Encounters[1];
-        for(uint8 i = 0; i < ENCOUNTERS; ++i)
+        for (uint8 i = 0; i < ENCOUNTERS; ++i)
             if(Encounters[i] == IN_PROGRESS)
                 Encounters[i] = NOT_STARTED;
         OUT_LOAD_INST_DATA_COMPLETE;
diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp
index cf6686421d1..cf6a9c63ce8 100644
--- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp
@@ -125,7 +125,6 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI
             uiBloodlustTimer = urand(35000,45000);
         } else uiBloodlustTimer -= diff;
 
-
         if (uiEarthShockTimer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_EARTH_SHOCK);
@@ -238,7 +237,6 @@ CreatureAI* GetAI_mob_erekem_guard(Creature* pCreature)
     return new mob_erekem_guardAI (pCreature);
 }
 
-
 void AddSC_boss_erekem()
 {
     Script *newscript;
diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp
index 53501a6425a..fa700d6253a 100644
--- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp
@@ -12,7 +12,6 @@ update creature_template set scriptname = '' where entry = '';
 #include "precompiled.h"
 #include "def_violet_hold.h"
 
-
 //Spells
 enum Spells
 {
diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp
index 60128f1b931..771b8e187da 100644
--- a/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp
+++ b/src/bindings/scripts/scripts/northrend/violet_hold/instance_violet_hold.cpp
@@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
@@ -385,7 +385,7 @@ struct TRINITY_DLL_DECL instance_violet_hold : public ScriptedInstance
             m_auiEncounter[1] = data1;
             m_auiEncounter[2] = data2;
 
-            for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+            for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
                 if (m_auiEncounter[i] == IN_PROGRESS)
                     m_auiEncounter[i] = NOT_STARTED;
 
diff --git a/src/bindings/scripts/scripts/northrend/zuldrak.cpp b/src/bindings/scripts/scripts/northrend/zuldrak.cpp
index 90a047b4c44..a740a8ea15c 100644
--- a/src/bindings/scripts/scripts/northrend/zuldrak.cpp
+++ b/src/bindings/scripts/scripts/northrend/zuldrak.cpp
@@ -92,7 +92,6 @@ CreatureAI* GetAI_npc_drakuru_shackles(Creature* pCreature)
     return new npc_drakuru_shacklesAI (pCreature);
 }
 
-
 /*####
 ## npc_captured_rageclaw
 ####*/
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
index 8b1c610e065..5baa380fa7e 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp
@@ -183,7 +183,6 @@ struct TRINITY_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI
         ScriptedAI::MoveInLineOfSight(who);
     }
 
-
     void EnterCombat(Unit *who)
     {
         DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), m_creature);
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
index c8dabff9650..878741387c8 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
@@ -86,7 +86,7 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI
             float dist;
             Map* pMap = m_creature->GetMap();
             Map::PlayerList const &PlayerList = pMap->GetPlayers();
-            for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+            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)))
                     {
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
index 1eca5a36734..83d7586da1c 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
@@ -122,7 +122,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/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
index 34bcdd86175..8508ad788bb 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
@@ -265,7 +265,7 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
         {
             Map* pMap = m_creature->GetMap();
             Map::PlayerList const &PlayerList = pMap->GetPlayers();
-            for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+            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))
                         i_pl->TeleportTo(m_creature->GetMapId(), VorpilPosition[0],VorpilPosition[1],VorpilPosition[2], 0, TELE_TO_NOT_LEAVE_COMBAT);
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
index 7782b5fed62..ac1991d0be2 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/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)
@@ -155,7 +155,7 @@ struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI
             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)
+                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))
                             DoCast(target, SPELL_THUNDERING_STORM, true);
@@ -178,7 +178,7 @@ struct TRINITY_DLL_DECL boss_murmurAI : public ScriptedAI
         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)
+            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))
                     {
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
index f8f3b73bffa..df4244991ee 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
@@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
@@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
         std::istringstream loadStream(in);
         loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3] >> m_auiEncounter[4];
 
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS)
                 m_auiEncounter[i] = NOT_STARTED;
 
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp
index be303f85980..2aaf2cbf6ae 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp
@@ -137,7 +137,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
 
         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
@@ -154,11 +154,11 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
         /*SpellEntry const *spellInfo = GetSpellStore()->LookupEntry(SPELL_BLOODBOIL);
         if (spellInfo)
         {
-            for(std::list<Unit *>::iterator itr = targets.begin(); itr != targets.end(); ++itr)
+            for (std::list<Unit *>::iterator itr = targets.begin(); itr != targets.end(); ++itr)
             {
                 Unit* target = *itr;
                 if (!target) return;
-                for(uint32 i = 0;i<3; ++i)
+                for (uint32 i = 0; i<3; ++i)
                 {
                     uint8 eff = spellInfo->Effect[i];
                     if (eff>=TOTAL_SPELL_EFFECTS)
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp
index e081e33eb06..65364d06bc3 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp
@@ -362,8 +362,6 @@ static Animation DemonTransformation[]=
 #define EMOTE_SETS_GAZE_ON     "sets its gaze on $N!"
 #define EMOTE_UNABLE_TO_SUMMON "is unable to summon Maiev Shadowsong and enter Phase 4. Resetting Encounter."
 
-
-
 /************************************** Illidan's AI ***************************************/
 struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
 {
@@ -404,7 +402,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
     {
         if (summon->GetCreatureInfo()->Entry == FLAME_OF_AZZINOTH)
         {
-            for(uint8 i = 0; i < 2; ++i)
+            for (uint8 i = 0; i < 2; ++i)
                 if (summon->GetGUID() == FlameGUID[i])
                     FlameGUID[i] = 0;
 
@@ -460,7 +458,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
 
         pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, DONE); // Completed
 
-        for(uint8 i = DATA_GAMEOBJECT_ILLIDAN_DOOR_R; i < DATA_GAMEOBJECT_ILLIDAN_DOOR_L + 1; ++i)
+        for (uint8 i = DATA_GAMEOBJECT_ILLIDAN_DOOR_R; i < DATA_GAMEOBJECT_ILLIDAN_DOOR_L + 1; ++i)
             pInstance->HandleGameObject(pInstance->GetData64(i), true);
     }
 
@@ -503,7 +501,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
 
     void DeleteFromThreatList(uint64 TargetGUID)
     {
-        for(std::list<HostilReference*>::iterator itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr)
+        for (std::list<HostilReference*>::iterator itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr)
         {
             if ((*itr)->getUnitGuid() == TargetGUID)
             {
@@ -601,7 +599,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
             Timer[EVENT_FLIGHT_SEQUENCE] = 0;
             break;
         case 8://glaive return
-            for(uint8 i = 0; i < 2; ++i)
+            for (uint8 i = 0; i < 2; ++i)
             {
                 if (GlaiveGUID[i])
                 {
@@ -619,7 +617,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
             m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
             m_creature->StopMoving();
             m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
-            for(uint8 i = 0; i < 2; ++i)
+            for (uint8 i = 0; i < 2; ++i)
             {
                 if (GlaiveGUID[i])
                 {
@@ -699,7 +697,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
             return;
 
         Event = EVENT_NULL;
-        for(uint32 i = 1; i <= MaxTimer[Phase]; ++i)
+        for (uint32 i = 1; i <= MaxTimer[Phase]; ++i)
         {
             if (Timer[i]) // Event is enabled
                 if (Timer[i] <= diff)
@@ -966,8 +964,6 @@ struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI
     }
 };
 
-
-
 /******* Functions and vars for Akama's AI ******/
 struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
 {
@@ -1010,14 +1006,14 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
             {
                 pInstance->HandleGameObject(GateGUID, false);
 
-                for(uint8 i = 0; i < 2; ++i)
+                for (uint8 i = 0; i < 2; ++i)
                     pInstance->HandleGameObject(DoorGUID[i], false);
                 //JustCreated = false;
             }else
             {//open all doors, raid wiped
                 pInstance->HandleGameObject(GateGUID, true);
                 WalkCount = 1;//skip first wp
-                for(uint8 i = 0; i < 2; ++i)
+                for (uint8 i = 0; i < 2; ++i)
                     pInstance->HandleGameObject(DoorGUID[i], true);
             }
         }
@@ -1075,13 +1071,13 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
     {
         std::list<HostilReference*>& threatList = m_creature->getThreatManager().getThreatList();
         std::vector<Unit*> eliteList;
-        for(std::list<HostilReference*>::iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
+        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)
                 eliteList.push_back(pUnit);
         }
-        for(std::vector<Unit*>::iterator itr = eliteList.begin(); itr != eliteList.end(); ++itr)
+        for (std::vector<Unit*>::iterator itr = eliteList.begin(); itr != eliteList.end(); ++itr)
             (*itr)->setDeathState(JUST_DIED);
         EnterEvadeMode();
     }
@@ -1092,7 +1088,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
             return;
 
         pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, IN_PROGRESS);
-        for(uint8 i = 0; i < 2; ++i)
+        for (uint8 i = 0; i < 2; ++i)
             pInstance->HandleGameObject(DoorGUID[i], false);
         if (GETCRE(Illidan, IllidanGUID))
         {
@@ -1125,7 +1121,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
             DoCast(Channel, SPELL_AKAMA_DOOR_FAIL);
         }
 
-        for(uint8 i = 0; i < 2; ++i)
+        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))
             {
                 Spirit->SetVisibility(VISIBILITY_OFF);
@@ -1292,7 +1288,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
         switch(WalkCount)
         {
         case 6:
-            for(uint8 i = 0; i < 2; ++i)
+            for (uint8 i = 0; i < 2; ++i)
                 if(pInstance)
                     pInstance->HandleGameObject(DoorGUID[i], true);
             break;
@@ -1398,7 +1394,6 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
     }
 };
 
-
 struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
 {
     boss_maievAI(Creature *c) : ScriptedAI(c) {};
@@ -1538,7 +1533,7 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
             return;
 
         Event = EVENT_MAIEV_NULL;
-        for(uint8 i = 1; i <= MaxTimer; ++i)
+        for (uint8 i = 1; i <= MaxTimer; ++i)
             if (Timer[i])
             {
                 if (Timer[i] <= diff)
@@ -1605,7 +1600,6 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
     }
 };
 
-
 bool GossipSelect_npc_akama_at_illidan(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
 {
     if (uiAction == GOSSIP_ACTION_INFO_DEF) // Time to begin the Event
@@ -1842,7 +1836,7 @@ void boss_illidan_stormrageAI::Reset()
     }
 
     MaievGUID = 0;
-    for(uint8 i = 0; i < 2; ++i)
+    for (uint8 i = 0; i < 2; ++i)
     {
         FlameGUID[i] = 0;
         GlaiveGUID[i] = 0;
@@ -1993,7 +1987,6 @@ void boss_illidan_stormrageAI::HandleTalkSequence()
     TalkCount++;
 }
 
-
 void boss_illidan_stormrageAI::CastEyeBlast()
 {
     m_creature->InterruptNonMeleeSpells(false);
@@ -2002,14 +1995,14 @@ void boss_illidan_stormrageAI::CastEyeBlast()
     DoPlaySoundToSet(m_creature, SOUND_EYE_BLAST);
 
     float distx, disty, dist[2];
-    for(uint8 i = 0; i < 2; ++i)
+    for (uint8 i = 0; i < 2; ++i)
     {
         distx = EyeBlast[i].x - HoverPosition[HoverPoint].x;
         disty = EyeBlast[i].y - HoverPosition[HoverPoint].y;
         dist[i] = distx * distx + disty * disty;
     }
     Locations initial = EyeBlast[dist[0] < dist[1] ? 0 : 1];
-    for(uint8 i = 0; i < 2; ++i)
+    for (uint8 i = 0; i < 2; ++i)
     {
         distx = GlaivePosition[i].x - HoverPosition[HoverPoint].x;
         disty = GlaivePosition[i].y - HoverPosition[HoverPoint].y;
@@ -2037,7 +2030,7 @@ void boss_illidan_stormrageAI::SummonFlamesOfAzzinoth()
     m_creature->MonsterYell(SAY_SUMMONFLAMES, LANG_UNIVERSAL, 0);
     DoPlaySoundToSet(m_creature, SOUND_SUMMONFLAMES);
 
-    for(uint8 i = 0; i < 2; ++i)
+    for (uint8 i = 0; i < 2; ++i)
     {
         if (GETUNIT(Glaive, GlaiveGUID[i]))
         {
@@ -2066,7 +2059,6 @@ void boss_illidan_stormrageAI::SummonMaiev()
     }
 }
 
-
 void boss_illidan_stormrageAI::EnterPhase(PhaseIllidan NextPhase)
 {
     DoZoneInCombat();
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp
index 524ab213d73..37cb75ca380 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp
@@ -105,7 +105,7 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
         if (pInstance)
             pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, NOT_STARTED);
 
-        for(uint8 i = 0; i<3; ++i)
+        for (uint8 i = 0; i<3; ++i)
             TargetGUID[i] = 0;
 
         BeamTimer = 20000; // Timers may be incorrect
@@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
         float X = TeleportPoint[random].x;
         float Y = TeleportPoint[random].y;
         float Z = TeleportPoint[random].z;
-        for(uint8 i = 0; i < 3; ++i)
+        for (uint8 i = 0; i < 3; ++i)
         {
             Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 1);
             if (pUnit && pUnit->isAlive() && (pUnit->GetTypeId() == TYPEID_PLAYER))
@@ -233,7 +233,7 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
             // 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)
             {
-                for(uint8 i = 0; i < 3; ++i)
+                for (uint8 i = 0; i < 3; ++i)
                 {
                     Unit* pUnit = NULL;
                     if (TargetGUID[i])
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
index f1e0873dd95..ef42da568a3 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
@@ -190,7 +190,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI
 
         std::list<HostilReference*>& m_threatlist = target->getThreatManager().getThreatList();
         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)
@@ -390,7 +390,7 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI
             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
@@ -481,7 +481,7 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI
     void SpellHit(Unit *caster, const SpellEntry *spell)
     {
         if (m_creature->GetCurrentSpell(CURRENT_GENERIC_SPELL))
-            for(uint8 i = 0; i < 3; ++i)
+            for (uint8 i = 0; i < 3; ++i)
                 if (spell->Effect[i] == SPELL_EFFECT_INTERRUPT_CAST)
                     if (m_creature->GetCurrentSpell(CURRENT_GENERIC_SPELL)->m_spellInfo->Id == SPELL_SOUL_SHOCK
                         || m_creature->GetCurrentSpell(CURRENT_GENERIC_SPELL)->m_spellInfo->Id == SPELL_DEADEN)
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp
index ada3230a6f6..63e9c4f0b59 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp
@@ -259,7 +259,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
 
             if (!Channelers.empty())
             {
-                for(std::list<uint64>::iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr)
+                for (std::list<uint64>::iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr)
                 {
                     Creature* Channeler = (Unit::GetCreature(*m_creature, *itr));
                     if (Channeler)
@@ -326,7 +326,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
         }
         else
         {
-            for(uint8 i = 0; i < 3; ++i)
+            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)
@@ -347,7 +347,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
 
         if (!ChannelerList.empty())
         {
-            for(std::list<Creature*>::iterator itr = ChannelerList.begin(); itr != ChannelerList.end(); ++itr)
+            for (std::list<Creature*>::iterator itr = ChannelerList.begin(); itr != ChannelerList.end(); ++itr)
             {
                 CAST_AI(mob_ashtongue_channelerAI, (*itr)->AI())->ShadeGUID = m_creature->GetGUID();
                 Channelers.push_back((*itr)->GetGUID());
@@ -365,7 +365,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI
             return;
         }
 
-        for(std::list<uint64>::iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr)
+        for (std::list<uint64>::iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr)
             if (Creature* Channeler = (Unit::GetCreature(*m_creature, *itr)))
                 Channeler->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
     }
@@ -701,7 +701,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
         {
             if (SummonBrokenTimer <= diff)
             {
-                for(uint8 i = 0; i < 4; ++i)
+                for (uint8 i = 0; i < 4; ++i)
                 {
                     float x = BrokenCoords[BrokenSummonIndex].x + (i*5);
                     float y = BrokenCoords[BrokenSummonIndex].y + (1*5);
@@ -743,7 +743,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
                     if (!BrokenList.empty())
                     {
                         bool Yelled = false;
-                        for(std::list<uint64>::iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr)
+                        for (std::list<uint64>::iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr)
                             if (Creature* pUnit = Unit::GetCreature(*m_creature, *itr))
                             {
                                 if (!Yelled)
@@ -760,7 +760,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
                 case 3:
                     if (!BrokenList.empty())
                     {
-                        for(std::list<uint64>::iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr)
+                        for (std::list<uint64>::iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++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);
@@ -771,7 +771,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
                 case 4:
                     if (!BrokenList.empty())
                     {
-                        for(std::list<uint64>::iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr)
+                        for (std::list<uint64>::iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr)
                             if (Creature* pUnit = Unit::GetCreature((*m_creature), *itr))
                                 pUnit->MonsterYell(SAY_BROKEN_FREE_02, LANG_UNIVERSAL, 0);
                     }
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp
index d4f06f13274..968fc3d6b98 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp
@@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL mob_shadowy_constructAI : public ScriptedAI
             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())
@@ -284,7 +284,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
 
         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)
+        for (i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
         {
             Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
             if (pUnit && pUnit->isAlive())
@@ -318,7 +318,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
                 Ghost->DealDamage(Ghost, Ghost->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL,
             false);
             }*/
-            for(uint8 i = 0; i < 4; ++i)
+            for (uint8 i = 0; i < 4; ++i)
             {
                 Creature* Construct = NULL;
                 float X = CalculateRandomLocation(Ghost->GetPositionX(), 10);
@@ -374,7 +374,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
         {
             //MindControlGhost();
 
-            for(uint8 i = 0; i < 2; ++i)
+            for (uint8 i = 0; i < 2; ++i)
             {
                 Creature* Shadow = NULL;
                 float X = CalculateRandomLocation(m_creature->GetPositionX(), 10);
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp
index 0d7e2a7e61d..1150b9e3ae5 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp
@@ -175,7 +175,7 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI
                     //m_creature->CastSpell(m_creature, SPELL_NEEDLE_SPINE, true);
                     std::list<Unit*> target;
                     SelectTargetList(target, 3, SELECT_TARGET_RANDOM, 80, true);
-                    for(std::list<Unit*>::iterator i = target.begin(); i != target.end(); ++i)
+                    for (std::list<Unit*>::iterator i = target.begin(); i != target.end(); ++i)
                         m_creature->CastSpell(*i, 39835, true);
                     events.ScheduleEvent(EVENT_NEEDLE, 15000+rand()%10000, GCD_CAST);
                     events.DelayEvents(1500, GCD_CAST);
diff --git a/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp b/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp
index 7530909cb11..7c32bb704dc 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp
@@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL mob_blood_elf_council_voice_triggerAI : public ScriptedA
 {
     mob_blood_elf_council_voice_triggerAI(Creature* c) : ScriptedAI(c)
     {
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
             Council[i] = 0;
     }
 
@@ -195,7 +195,7 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
     mob_illidari_councilAI(Creature *c) : ScriptedAI(c)
     {
         pInstance = c->GetInstanceData();
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
             Council[i] = 0;
     }
 
@@ -218,7 +218,7 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
         DeathCount = 0;
 
         Creature* pMember = NULL;
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             if (pMember = (Unit::GetCreature((*m_creature), Council[i])))
             {
@@ -268,7 +268,7 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
                 CAST_AI(mob_blood_elf_council_voice_triggerAI, VoiceTrigger->AI())->EventStarted = true;
             }
 
-            for(uint8 i = 0; i < 4; ++i)
+            for (uint8 i = 0; i < 4; ++i)
             {
                 Unit* Member = NULL;
                 if (Council[i])
@@ -319,7 +319,7 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
             if (CheckTimer <= diff)
             {
                 uint8 EvadeCheck = 0;
-                for(uint8 i = 0; i < 4; ++i)
+                for (uint8 i = 0; i < 4; ++i)
                 {
                     if (Council[i])
                     {
@@ -353,7 +353,7 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI
     boss_illidari_councilAI(Creature* c) : ScriptedAI(c)
     {
         pInstance = c->GetInstanceData();
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
             Council[i] = 0;
         LoadedGUIDs = false;
     }
@@ -389,7 +389,7 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI
 
     void EnterEvadeMode()
     {
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             if (Unit* pUnit = Unit::GetUnit(*m_creature, Council[i]))
                 if (pUnit != m_creature && pUnit->getVictim())
@@ -407,7 +407,7 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI
             return;
 
         damage /= 4;
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             if (Creature* pUnit = Unit::GetCreature(*m_creature, Council[i]))
                 if (pUnit != m_creature && damage < pUnit->GetHealth())
@@ -485,7 +485,7 @@ struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_coun
             case 0: spellid = SPELL_DEVOTION_AURA;   break;
             case 1: spellid = SPELL_CHROMATIC_AURA;  break;
         }
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             Unit* pUnit = Unit::GetUnit((*m_creature), Council[i]);
             if (pUnit)
diff --git a/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp b/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp
index cd67af9a8f3..1d41f2c63f4 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp
@@ -105,7 +105,7 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
@@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance
 
         if (!players.isEmpty())
         {
-            for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
+            for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
             {
                 if (Player* plr = itr->getSource())
                     return plr;
@@ -322,7 +322,7 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance
         >> m_auiEncounter[3] >> m_auiEncounter[4] >> m_auiEncounter[5] >> m_auiEncounter[6]
         >> m_auiEncounter[7] >> m_auiEncounter[8];
 
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS)
                 m_auiEncounter[i] = NOT_STARTED;
 
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
index 7b25584cf64..75f0c14d884 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
@@ -120,8 +120,6 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI
 
         BlessingOfTides = false;
 
-
-
         if (pInstance)
         {
             uint64 RAdvisors[3];
@@ -130,7 +128,7 @@ 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])
             {
@@ -145,7 +143,6 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI
             pInstance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED);
         }
 
-
     }
 
     void EventSharkkisDeath()
@@ -271,7 +268,7 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI
             BlessingOfTides = true;
             bool continueTriggering;
             Creature* Advisor;
-            for(uint8 i = 0; i < 4; ++i)
+            for (uint8 i = 0; i < 4; ++i)
                 if (Advisors[i])
                 {
                     Advisor = (Unit::GetCreature(*m_creature, Advisors[i]));
@@ -315,7 +312,6 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI
 
     uint64 SummonedPet;
 
-
     void Reset()
     {
         LeechingThrow_Timer = 20000;
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
index 288b8cf917e..b7324a9850f 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
@@ -144,7 +144,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI
     }
     void DeSummonBeams()
     {
-        for(uint8 i=0;i<2; ++i)
+        for (uint8 i=0; i<2; ++i)
         {
             Creature* mob = Unit::GetCreature(*m_creature,beams[i]);
             if (mob)
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
index 0ee1a68ee0e..bf85c02863d 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
@@ -190,7 +190,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
         }else CanAttack = true;
 
         Unit *remo;
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             remo = Unit::GetUnit(*m_creature, ShieldGeneratorChannel[i]);
             if (remo)
@@ -244,7 +244,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
             //remove old tainted cores to prevent cheating in phase 2
             Map* pMap = m_creature->GetMap();
             Map::PlayerList const &PlayerList = pMap->GetPlayers();
-            for(Map::PlayerList::const_iterator i = PlayerList.begin();i != PlayerList.end(); ++i)
+            for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
             {
                 if (Player* i_pl = i->getSource())
                 {
@@ -393,7 +393,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
                     DoTeleportTo(MIDDLE_X, MIDDLE_Y, MIDDLE_Z);
 
                     Creature *pCreature;
-                    for(uint8 i = 0; i < 4; ++i)
+                    for (uint8 i = 0; i < 4; ++i)
                     {
                         pCreature = m_creature->SummonCreature(SHIED_GENERATOR_CHANNEL, ShieldGeneratorChannelPos[i][0],  ShieldGeneratorChannelPos[i][1],  ShieldGeneratorChannelPos[i][2],  ShieldGeneratorChannelPos[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
                         if (pCreature)
@@ -440,7 +440,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
                 bool InMeleeRange = false;
                 Unit *target;
                 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)
                 {
                     target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
                                                             //if in melee range
@@ -584,7 +584,7 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI
         phase = 1;
         Vashj = NULL;
 
-        for (int i = 0;i<8; ++i)//search for nearest waypoint (up on stairs)
+        for (int i = 0; i<8; ++i)//search for nearest waypoint (up on stairs)
         {
             if (!x || !y || !z)
             {
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
index f57f0542bdf..7e5922235b1 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
@@ -130,7 +130,6 @@ struct TRINITY_DLL_DECL mob_inner_demonAI : public ScriptedAI
             Link_Timer = 1000;
         }else Link_Timer -= diff;
 
-
         if (!m_creature->HasAura(AURA_DEMONIC_ALIGNMENT))
             DoCast(m_creature, AURA_DEMONIC_ALIGNMENT,true);
 
@@ -152,7 +151,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
         pInstance = c->GetInstanceData();
         Demon = 0;
 
-        for(uint8 i = 0; i < 3; ++i)//clear guids
+        for (uint8 i = 0; i < 3; ++i)//clear guids
             SpellBinderGUID[i] = 0;
     }
 
@@ -207,7 +206,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
 
     void CheckChannelers(bool DoEvade = true)
     {
-        for(uint8 i = 0; i < 3; ++i)
+        for (uint8 i = 0; i < 3; ++i)
         {
             if (Creature *add = Unit::GetCreature(*m_creature,SpellBinderGUID[i]))
                 add->DisappearAndDie();
@@ -256,7 +255,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
     void CheckBanish()
     {
         uint8 AliveChannelers = 0;
-        for(uint8 i = 0; i < 3; ++i)
+        for (uint8 i = 0; i < 3; ++i)
         {
             Unit *add = Unit::GetUnit(*m_creature,SpellBinderGUID[i]);
             if (add && add->isAlive())
@@ -306,7 +305,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
     //Despawn all Inner Demon summoned
     void DespawnDemon()
     {
-        for(uint8 i=0; i<5; ++i)
+        for (uint8 i=0; i<5; ++i)
         {
             if (InnderDemon[i])
             {
@@ -325,7 +324,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
 
     void CastConsumingMadness() //remove this once SPELL_INSIDIOUS_WHISPER is supported by core
     {
-        for(uint8 i=0; i<5; ++i)
+        for (uint8 i=0; i<5; ++i)
         {
             if (InnderDemon[i] > 0)
             {
@@ -481,14 +480,14 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
             {
                 std::list<HostilReference *>& ThreatList = m_creature->getThreatManager().getThreatList();
                 std::vector<Unit *> TargetList;
-                for(std::list<HostilReference *>::iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr)
+                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);
                 }
                 SpellEntry *spell = GET_SPELL(SPELL_INSIDIOUS_WHISPER);
-                for(std::vector<Unit *>::iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr)
+                for (std::vector<Unit *>::iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr)
                 {
                     if ((*itr) && (*itr)->isAlive())
                     {
@@ -724,12 +723,12 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI
         {
             Map* pMap = m_creature->GetMap();
             Map::PlayerList const &PlayerList = pMap->GetPlayers();
-            for(Map::PlayerList::const_iterator itr = PlayerList.begin();itr != PlayerList.end(); ++itr)
+            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)
+                    for (uint8 i = 0; i < CURRENT_MAX_SPELL; ++i)
                         if (i_pl->GetCurrentSpell(i))
                             isCasting = true;
 
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
index 1146cf96b24..7aca819af4b 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
@@ -201,8 +201,6 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
             return;
         }
 
-
-
         if(m_creature->getThreatManager().getThreatList().empty())//check if should evade
         {
             if(m_creature->isInCombat())
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
index b624f5ba827..506365c468e 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
@@ -194,7 +194,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
             {
                 DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), m_creature);
 
-                for(uint8 i = 0; i < 10; ++i)
+                for (uint8 i = 0; i < 10; ++i)
                 {
                     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);
@@ -224,7 +224,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
                 using std::set;
                 set<int>list;
                 set<int>::iterator itr;
-                for(uint8 i = 0; i < 4; ++i)
+                for (uint8 i = 0; i < 4; ++i)
                 {
                     counter = 0;
                     do{target = SelectTarget(SELECT_TARGET_RANDOM, 1, 50, true);    //target players only
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
index bd917a6e5c7..4229c9a8a06 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
@@ -122,7 +122,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
@@ -369,7 +369,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
         std::istringstream stream(in);
         stream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3]
         >> m_auiEncounter[4] >> m_auiEncounter[5] >> TrashCount;
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             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;
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
index 1ee00f2ef81..e13aafce51d 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
@@ -80,7 +80,7 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
              if (m_auiEncounter[i] == IN_PROGRESS)
                  return true;
 
@@ -202,7 +202,7 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance
         OUT_LOAD_INST_DATA(in);
         std::istringstream stream(in);
         stream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS)
                 m_auiEncounter[i] = NOT_STARTED;
         OUT_LOAD_INST_DATA_COMPLETE;
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
index 1b76860cf60..6695ce6eb9c 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
@@ -80,7 +80,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)
+        for (std::list<uint64>::iterator i = Striders.begin(); i != Striders.end(); ++i)
             if (Creature *strider = Unit::GetCreature(*m_creature, *i))
                 strider->DisappearAndDie();
     }
diff --git a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
index 849712ab336..30a09538ab2 100644
--- a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
+++ b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
@@ -109,7 +109,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
     boss_high_king_maulgarAI(Creature *c) : ScriptedAI(c)
     {
         pInstance = c->GetInstanceData();
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
             Council[i] = 0;
     }
 
@@ -138,7 +138,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
         Phase2 = false;
 
         Creature *pCreature = NULL;
-        for(uint8 i = 0; i < 4; ++i)
+        for (uint8 i = 0; i < 4; ++i)
         {
             if (Council[i])
             {
@@ -174,7 +174,6 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
             DoScriptText(RAND(SAY_OGRE_DEATH1,SAY_OGRE_DEATH2,SAY_OGRE_DEATH3,SAY_OGRE_DEATH4), m_creature);
        }
 
-
     void EnterCombat(Unit *who)
     {
         StartEvent(who);
@@ -403,7 +402,6 @@ struct TRINITY_DLL_DECL boss_olm_the_summonerAI : public ScriptedAI
             DeathCoil_Timer = 20000;
         }else DeathCoil_Timer -= diff;
 
-
         DoMeleeAttackIfReady();
     }
 };
@@ -710,7 +708,7 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI
             Unit *target;
             std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
             std::vector<Unit *> target_list;
-            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)
             {
                 target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
                                                             //15 yard radius minimum
diff --git a/src/bindings/scripts/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp b/src/bindings/scripts/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
index 0ac5cbcaf7a..8de6f2ed18a 100644
--- a/src/bindings/scripts/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
+++ b/src/bindings/scripts/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
@@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
@@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
         OUT_LOAD_INST_DATA(in);
         std::istringstream stream(in);
         stream >> m_auiEncounter[0] >> m_auiEncounter[1];
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             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;
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
index d47c3eecceb..236b35f0031 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
@@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
     {
         pInstance = c->GetInstanceData();
         HeroicMode = c->GetMap()->IsHeroic();
-        for(uint8 i=0; i<5; ++i)
+        for (uint8 i=0; i<5; ++i)
             Channelers[i] = 0;
     }
 
@@ -125,7 +125,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
             addYell = true;
             DoScriptText(RAND(SAY_ADD_AGGRO_1,SAY_ADD_AGGRO_2,SAY_ADD_AGGRO_3), m_creature);
         }
-        for(uint8 i=0; i<5; ++i)
+        for (uint8 i=0; i<5; ++i)
         {
             Creature *channeler = Unit::GetCreature(*m_creature, Channelers[i]);
             if (who && channeler && !channeler->isInCombat())
@@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
 
     void ChannelerDied(Unit* killer)
     {
-        for(uint8 i=0; i<5; ++i)
+        for (uint8 i=0; i<5; ++i)
         {
             Creature *channeler = Unit::GetCreature(*m_creature, Channelers[i]);
             if (channeler && channeler->isAlive())
@@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
         SummonChannelers();
         if (!channeler1) return NULL;
         uint8 i;
-        for(i=0; i<5; ++i)
+        for (i=0; i<5; ++i)
         {
             Creature *channeler = Unit::GetCreature(*m_creature, Channelers[i]);
             if (channeler && channeler->GetGUID() == channeler1->GetGUID())
@@ -162,7 +162,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
 
     void SummonChannelers()
     {
-        for(uint8 i=0; i<5; ++i)
+        for (uint8 i=0; i<5; ++i)
         {
             Creature *channeler = Unit::GetCreature(*m_creature, Channelers[i]);
             if (!channeler || channeler->isDead())
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
index 9c19888c92c..35fd93d0514 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
@@ -94,7 +94,6 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI
         pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR2), true);
         pInstance->HandleGameObject(pInstance->GetData64(DATA_DOOR3), true);
 
-
      }
 
     void UpdateAI(const uint32 diff)
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
index 5a18ded0c08..7473f84c5eb 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
@@ -80,7 +80,6 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance
         PrisonCell8GUID = 0;
     }
 
-
     void OnCreatureCreate(Creature* pCreature, bool add)
     {
         if (!add)
@@ -209,7 +208,7 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance
         std::istringstream loadStream(in);
         loadStream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2];
 
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS || m_auiEncounter[i] == FAIL)
                 m_auiEncounter[i] = NOT_STARTED;
 
@@ -217,7 +216,6 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance
     }
 };
 
-
 InstanceData* GetInstanceData_instance_blood_furnace(Map* pMap)
 {
     return new instance_blood_furnace(pMap);
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
index 667c672c97d..71043ecaa1f 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
@@ -431,7 +431,6 @@ CreatureAI* GetAI_boss_vazruden(Creature* pCreature)
     return new boss_vazrudenAI (pCreature);
 }
 
-
 CreatureAI* GetAI_boss_nazan(Creature* pCreature)
 {
     return new boss_nazanAI (pCreature);
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
index 3f2dba74aa8..c599f71f04f 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
@@ -257,7 +257,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI
         uint32 ClickerNum = 0;
         // now checking if every clicker has debuff from manticron(it is dispelable atm rev 6110 : S)
         // if not - apply mind exhaustion and delete from clicker's list
-        for(CubeMap::iterator i = Cube.begin(); i != Cube.end(); ++i)
+        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))
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
index 33946926976..e1778315376 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
@@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
         return false;
     }
@@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
                 if (m_auiEncounter[1] != NOT_STARTED)
                 {
                     m_auiEncounter[1] = NOT_STARTED;
-                    for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                    for (std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                     {
                         if (Creature *Channeler = instance->GetCreature(*i))
                         {
@@ -153,7 +153,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
                 {
                     m_auiEncounter[1] = IN_PROGRESS;
                     // Let all five channelers aggro.
-                    for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                    for (std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                     {
                         Creature *Channeler = instance->GetCreature(*i);
                         if (Channeler && Channeler->isAlive())
@@ -169,7 +169,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
                     HandleGameObject(DoorGUID, false);
                 }break;
             case DONE: // Add buff and check if all channelers are dead.
-                for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                for (std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                 {
                     Creature *Channeler = instance->GetCreature(*i);
                     if (Channeler && Channeler->isAlive())
@@ -184,7 +184,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
             break;
         case DATA_COLLAPSE:
             // true - collapse / false - reset
-            for(std::set<uint64>::iterator i = ColumnGUID.begin(); i != ColumnGUID.end(); ++i)
+            for (std::set<uint64>::iterator i = ColumnGUID.begin(); i != ColumnGUID.end(); ++i)
                 DoUseDoorOrButton(*i);
             break;
         default:
@@ -219,7 +219,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
         {
             if (RespawnTimer <= diff)
             {
-                for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                for (std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                 {
                     if (Creature *Channeler = instance->GetCreature(*i))
                     {
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
index 2fe6fec2684..9a214be170a 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
@@ -177,7 +177,6 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI
             RightHeadGUID = 0;
         }
 
-
         AggroYell = false;
         ThreatYell = false;
         ThreatYell2 = false;
@@ -250,7 +249,6 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI
         Unit* pLeftHead  = Unit::GetUnit(*m_creature,LeftHeadGUID);
         Unit* pRightHead = Unit::GetUnit(*m_creature,RightHeadGUID);
 
-
         if (!pLeftHead || !pRightHead)
             return;
 
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
index 98a5cea12c3..1ac44b4317d 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
@@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI
 
     void removeAdds()
     {
-        for(std::vector<uint64>::iterator itr = adds.begin(); itr!= adds.end(); ++itr)
+        for (std::vector<uint64>::iterator itr = adds.begin(); itr!= adds.end(); ++itr)
         {
             Unit* temp = Unit::GetUnit((*m_creature),*itr);
             if (temp && temp->isAlive())
@@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI
         }
         adds.clear();
 
-        for(std::vector<uint64>::iterator itr = assassins.begin(); itr!= assassins.end(); ++itr)
+        for (std::vector<uint64>::iterator itr = assassins.begin(); itr!= assassins.end(); ++itr)
         {
             Unit* temp = Unit::GetUnit((*m_creature),*itr);
             if (temp && temp->isAlive())
@@ -245,7 +245,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI
             {
                 Unit* target = NULL;
 
-                for(uint8 i = 0; i < summoned; ++i)
+                for (uint8 i = 0; i < summoned; ++i)
                 {
                     switch(rand()%3)
                     {
diff --git a/src/bindings/scripts/scripts/outland/netherstorm.cpp b/src/bindings/scripts/scripts/outland/netherstorm.cpp
index d648c26b571..6364aa74300 100644
--- a/src/bindings/scripts/scripts/outland/netherstorm.cpp
+++ b/src/bindings/scripts/scripts/outland/netherstorm.cpp
@@ -364,12 +364,10 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
 {
     npc_commander_dawnforgeAI(Creature *c) : ScriptedAI(c) { Reset (); }
 
-
     uint64 PlayerGUID;
     uint64 ardonisGUID;
     uint64 pathaleonGUID;
 
-
     uint32 Phase;
     uint32 PhaseSubphase;
     uint32 Phase_Timer;
diff --git a/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp
index 3a6a121ff4d..a1e8d5d8291 100644
--- a/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp
+++ b/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp
@@ -61,7 +61,6 @@ enum eMatureNetherwing
     NPC_EVENT_PINGER            = 22131
 };
 
-
 struct TRINITY_DLL_DECL mob_mature_netherwing_drakeAI : public ScriptedAI
 {
     mob_mature_netherwing_drakeAI(Creature* c) : ScriptedAI(c) { }
@@ -1414,7 +1413,7 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI
         uint8 FelguardCount = 0;
         uint8 DreadlordCount = 0;
 
-        for(uint8 i = 0; i < count; ++i)
+        for (uint8 i = 0; i < count; ++i)
         {
             Creature* Spawn = NULL;
             float X = SpawnLocation[locIndex + i].x;
@@ -1491,7 +1490,7 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI
 
             const Group::MemberSlotList members = EventGroup->GetMemberSlots();
 
-            for(Group::member_citerator itr = members.begin(); itr!= members.end(); itr++)
+            for (Group::member_citerator itr = members.begin(); itr!= members.end(); itr++)
             {
                 GroupMember = (Unit::GetPlayer(itr->guid));
                 if (!GroupMember)
@@ -1517,7 +1516,7 @@ struct TRINITY_DLL_DECL npc_lord_illidan_stormrageAI : public ScriptedAI
 
             if (GroupMemberCount == DeadMemberCount)
             {
-                for(Group::member_citerator itr = members.begin(); itr!= members.end(); itr++)
+                for (Group::member_citerator itr = members.begin(); itr!= members.end(); itr++)
                 {
                     GroupMember = Unit::GetPlayer(itr->guid);
 
diff --git a/src/bindings/scripts/scripts/outland/shattrath_city.cpp b/src/bindings/scripts/scripts/outland/shattrath_city.cpp
index cd25653fc61..f929aa636c8 100644
--- a/src/bindings/scripts/scripts/outland/shattrath_city.cpp
+++ b/src/bindings/scripts/scripts/outland/shattrath_city.cpp
@@ -280,7 +280,6 @@ struct TRINITY_DLL_DECL npc_kservantAI : public npc_escortAI
 public:
     npc_kservantAI(Creature *c) : npc_escortAI(c) {}
 
-
     void WaypointReached(uint32 i)
     {
         Player* pPlayer = GetPlayerForEscort();
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
index ebf5484671c..c4eaece8d9f 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
@@ -38,7 +38,6 @@ EndScriptData */
 
 #define MELLICHAR   20904                                   //skyriss will kill this unit
 
-
 /* Arcatraz encounters:
 1 - Zereketh the Unbound event
 2 - Dalliah the Doomsayer event
@@ -83,7 +82,7 @@ struct TRINITY_DLL_DECL instance_arcatraz : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
index 2e48e5147a3..9b23a107792 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
@@ -126,7 +126,7 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI
             {
                 if (!Adds_List.empty())
                 {
-                    for(std::list<uint64>::iterator itr = Adds_List.begin(); itr != Adds_List.end(); ++itr)
+                    for (std::list<uint64>::iterator itr = Adds_List.begin(); itr != Adds_List.end(); ++itr)
                     {
                         if (Unit *temp = Unit::GetUnit(*m_creature,*itr))
                         {
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp
index e06b1b03a41..486b60b41a5 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp
@@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL boss_warp_splinterAI : public ScriptedAI
 
     void SummonTreants()
     {
-        for(uint8 i = 0; i < 6; ++i)
+        for (uint8 i = 0; i < 6; ++i)
         {
             float angle = (M_PI / 3) * i;
 
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp
index b96ca667835..d62e5557e6e 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp
@@ -288,7 +288,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
                         WaitTimer = 2000;
                         return;
                     case WE_SUMMON:
-                        for(uint8 i = 0; i < 2; ++i)
+                        for (uint8 i = 0; i < 2; ++i)
                             DoSpawnCreature(CREATURE_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
                         m_creature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10);
                         m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
index 7cf9f3b1c62..2b0ed6aa225 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
@@ -263,7 +263,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
                 //After these 50 seconds she portals to the middle of the room and disappears, leaving 3 light portals behind.
                 m_creature->GetMotionMaster()->Clear();
                 m_creature->GetMap()->CreatureRelocation(m_creature, CENTER_X, CENTER_Y, CENTER_Z, CENTER_O);
-                for(uint8 i=0; i<=2; ++i)
+                for (uint8 i=0; i<=2; ++i)
                 {
                     if (!i)
                     {
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
index 2341f78ebe3..ab6f38d846c 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
@@ -332,7 +332,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
 
     void PrepareAdvisors()
     {
-        for(uint8 i = 0; i < MAX_ADVISORS; ++i)
+        for (uint8 i = 0; i < MAX_ADVISORS; ++i)
         {
             if (Creature *pCreature = Unit::GetCreature((*m_creature), m_auiAdvisorGuid[i]))
             {
@@ -451,7 +451,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
         if (m_pInstance)
             m_pInstance->SetData(DATA_KAELTHASEVENT, 0);
 
-        for(uint8 i = 0; i < MAX_ADVISORS; ++i)
+        for (uint8 i = 0; i < MAX_ADVISORS; ++i)
         {
             if (Unit* pAdvisor = Unit::GetUnit((*m_creature), m_auiAdvisorGuid[i]))
                 pAdvisor->Kill(pAdvisor);
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
index c1de7772120..5db46a68bb2 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
@@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI
             Unit *target = NULL;
             std::list<HostilReference *> t_list = m_creature->getThreatManager().getThreatList();
             std::vector<Unit *> target_list;
-            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)
             {
                 target = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid());
                 if (!target)
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
index f973f96c1ff..16ae07fe034 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
@@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS) return true;
 
         return false;
@@ -153,7 +153,7 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance
         OUT_LOAD_INST_DATA(in);
         std::istringstream stream(in);
         stream >> m_auiEncounter[0] >> m_auiEncounter[1] >> m_auiEncounter[2] >> m_auiEncounter[3];
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             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;
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
index 02e44616b52..f26efdf25f9 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
@@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI
 
         if (Summon_Timer < diff)
         {
-            for(uint8 i = 0; i < 3; ++i)
+            for (uint8 i = 0; i < 3; ++i)
             {
                 Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0);
                 Creature* Wraith = m_creature->SummonCreature(21062,m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
index e43190620d9..9a30eec6f71 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
@@ -30,7 +30,6 @@ struct TRINITY_DLL_DECL instance_mechanar : public ScriptedInstance
 {
     instance_mechanar(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
-
     uint32 m_auiEncounter[MAX_ENCOUNTER];
 
     void Initialize()
@@ -40,7 +39,7 @@ struct TRINITY_DLL_DECL instance_mechanar : public ScriptedInstance
 
     bool IsEncounterInProgress() const
     {
-        for(uint8 i = 0; i < MAX_ENCOUNTER; ++i)
+        for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
             if (m_auiEncounter[i] == IN_PROGRESS)
                 return true;
 
diff --git a/src/bindings/scripts/scripts/outland/terokkar_forest.cpp b/src/bindings/scripts/scripts/outland/terokkar_forest.cpp
index 76776234d98..1d0d0bdc144 100644
--- a/src/bindings/scripts/scripts/outland/terokkar_forest.cpp
+++ b/src/bindings/scripts/scripts/outland/terokkar_forest.cpp
@@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL mob_unkor_the_ruthlessAI : public ScriptedAI
         {
             if (Group* pGroup = CAST_PLR(done_by)->GetGroup())
             {
-                for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
+                for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
                 {
                     Player *pGroupie = itr->getSource();
                     if (pGroupie &&
@@ -168,7 +168,6 @@ CreatureAI* GetAI_mob_infested_root_walker(Creature* pCreature)
     return new mob_infested_root_walkerAI (pCreature);
 }
 
-
 /*######
 ## mob_skywing
 ######*/
@@ -580,7 +579,6 @@ struct TRINITY_DLL_DECL npc_akunoAI : public npc_escortAI
         if(IsWalking && !m_creature->HasUnitMovementFlag(MOVEMENTFLAG_WALK_MODE))
             m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
 
-
         switch(i)
         {
         case 0: m_creature->setFaction(5); break;
diff --git a/src/bindings/scripts/scripts/world/boss_emeriss.cpp b/src/bindings/scripts/scripts/world/boss_emeriss.cpp
index fa53ed89d21..89c3840de80 100644
--- a/src/bindings/scripts/scripts/world/boss_emeriss.cpp
+++ b/src/bindings/scripts/scripts/world/boss_emeriss.cpp
@@ -47,7 +47,6 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI
     uint32 m_uiVolatileInfection_Timer;
     uint32 m_uiCorruptionsCasted;
 
-
     void Reset()
     {
         m_uiSleep_Timer = 15000 + rand()%5000;
@@ -107,7 +106,6 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI
         //else
         //    m_uiMarkOfNature_Timer -= uiDiff;
 
-
         //VolatileInfection_Timer
         if (m_uiVolatileInfection_Timer < uiDiff)
         {
diff --git a/src/bindings/scripts/scripts/world/boss_taerar.cpp b/src/bindings/scripts/scripts/world/boss_taerar.cpp
index 6659924c41b..a3a6e87f2d5 100644
--- a/src/bindings/scripts/scripts/world/boss_taerar.cpp
+++ b/src/bindings/scripts/scripts/world/boss_taerar.cpp
@@ -182,7 +182,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI
 
                 int iSize = sizeof(m_auiSpellSummonShade) / sizeof(uint32);
 
-                for(int i = 0; i < iSize; ++i)
+                for (int i = 0; i < iSize; ++i)
                     m_creature->CastSpell(pTarget, m_auiSpellSummonShade[i], true);
 
                 ++m_uiShadesSummoned;                       // prevent casting twice at same health
diff --git a/src/bindings/scripts/scripts/world/boss_ysondre.cpp b/src/bindings/scripts/scripts/world/boss_ysondre.cpp
index 2f3948d38d9..5f612b43f0a 100644
--- a/src/bindings/scripts/scripts/world/boss_ysondre.cpp
+++ b/src/bindings/scripts/scripts/world/boss_ysondre.cpp
@@ -136,7 +136,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI
         {
             DoScriptText(SAY_SUMMONDRUIDS, m_creature);
 
-            for(int i = 0; i < 10; ++i)
+            for (int i = 0; i < 10; ++i)
                 DoCast(m_creature, SPELL_SUMMONDRUIDS, true);
 
             ++m_uiSummonDruidModifier;
diff --git a/src/bindings/scripts/scripts/world/mob_generic_creature.cpp b/src/bindings/scripts/scripts/world/mob_generic_creature.cpp
index 45807337f5e..4d53ba575de 100644
--- a/src/bindings/scripts/scripts/world/mob_generic_creature.cpp
+++ b/src/bindings/scripts/scripts/world/mob_generic_creature.cpp
@@ -144,7 +144,6 @@ struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI
                     //Set our global cooldown
                     GlobalCooldown = GENERIC_CREATURE_COOLDOWN;
 
-
                 }//If no spells available and we arn't moving run to target
                 else if (IsSelfRooted)
                 {
diff --git a/src/bindings/scripts/scripts/world/npc_professions.cpp b/src/bindings/scripts/scripts/world/npc_professions.cpp
index 484339c59bb..08822f58ecd 100644
--- a/src/bindings/scripts/scripts/world/npc_professions.cpp
+++ b/src/bindings/scripts/scripts/world/npc_professions.cpp
@@ -224,14 +224,14 @@ bool EquippedOk(Player* pPlayer, uint32 spellId)
     if (!spell)
         return false;
 
-    for(uint8 i=0; i<3; ++i)
+    for (uint8 i=0; i<3; ++i)
     {
         uint32 reqSpell = spell->EffectTriggerSpell[i];
         if (!reqSpell)
             continue;
 
         Item* pItem;
-        for(uint8 j = EQUIPMENT_SLOT_START; j < EQUIPMENT_SLOT_END; j++)
+        for (uint8 j = EQUIPMENT_SLOT_START; j < EQUIPMENT_SLOT_END; j++)
         {
             pItem = pPlayer->GetItemByPos(INVENTORY_SLOT_BAG_0, j);
             if (pItem)
diff --git a/src/bindings/scripts/scripts/world/npcs_special.cpp b/src/bindings/scripts/scripts/world/npcs_special.cpp
index ce1d73caf5e..176522e3bbd 100644
--- a/src/bindings/scripts/scripts/world/npcs_special.cpp
+++ b/src/bindings/scripts/scripts/world/npcs_special.cpp
@@ -650,11 +650,11 @@ void npc_doctorAI::BeginEvent(Player* pPlayer)
     switch(m_creature->GetEntry())
     {
         case DOCTOR_ALLIANCE:
-            for(uint8 i = 0; i < ALLIANCE_COORDS; ++i)
+            for (uint8 i = 0; i < ALLIANCE_COORDS; ++i)
                 Coordinates.push_back(&AllianceCoords[i]);
             break;
         case DOCTOR_HORDE:
-            for(uint8 i = 0; i < HORDE_COORDS; ++i)
+            for (uint8 i = 0; i < HORDE_COORDS; ++i)
                 Coordinates.push_back(&HordeCoords[i]);
             break;
     }
@@ -701,7 +701,7 @@ void npc_doctorAI::PatientSaved(Creature* soldier, Player* pPlayer, Location* Po
                 if (!Patients.empty())
                 {
                     std::list<uint64>::iterator itr;
-                    for(itr = Patients.begin(); itr != Patients.end(); ++itr)
+                    for (itr = Patients.begin(); itr != Patients.end(); ++itr)
                     {
                         if (Creature* Patient = Unit::GetCreature((*m_creature), *itr))
                             Patient->setDeathState(JUST_DIED);
@@ -1725,7 +1725,7 @@ struct TRINITY_DLL_DECL npc_ebon_gargoyleAI : CasterAI
         Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(m_creature, m_creature, 30);
         Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(m_creature, targets, u_check);
         m_creature->VisitNearbyObject(30, searcher);
-        for(std::list<Unit*>::iterator iter = targets.begin(); iter != targets.end(); ++iter)
+        for (std::list<Unit*>::iterator iter = targets.begin(); iter != targets.end(); ++iter)
             if((*iter)->GetAura(49206,owner->GetGUID()))
             {
                 me->Attack((*iter),false);