Fix style (split for more readable diff)

49 files changed, 311 insertions, 324 deletions

diff --git a/world/map/conf/magic-base.sex b/world/map/conf/magic-base.sex
index 64b69a58..8f3b9978 100644
--- a/world/map/conf/magic-base.sex
+++ b/world/map/conf/magic-base.sex
@@ -3068,17 +3068,18 @@
                 mes @caster_name$ + \" wishes to marry you.\";
                 mes \"Do you accept?\";
                 next;
-                menu \"Yes, I do!\", L_yes,
-                     \"No.\", L_Close;
+                menu
+                    \"Yes, I do!\", L_yes,
+                    \"No.\", L_Close;
 
-                L_yes:
-                    if marriage(@caster_name$)
-                        announce @caster_name$ + \" and \" + strcharinfo(0) + \" are now married!\", 0;
-                    goto L_Close;
+            L_yes:
+                if (marriage(@caster_name$))
+                    announce @caster_name$ + \" and \" + strcharinfo(0) + \" are now married!\", 0;
+                goto L_Close;
 
             L_Close:
                 close;
-              }")
+            }")
             (IF (not
                     (is_married caster))
                 (message caster
diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt
index 2a5a0095..8f52e771 100644
--- a/world/map/npc/001-1/elanore.txt
+++ b/world/map/npc/001-1/elanore.txt
@@ -48,68 +48,68 @@ function|script|ElanoreFix|,
     if (sc_check(sc_poison)) goto L_CurePoison;
     if (BaseLevel > 10) goto L_NoHeal;
     set @TEMP,rand(4);
-    if(@TEMP == 1) goto Heal2;
-    if(@TEMP == 2) goto Heal3;
-    if(@TEMP == 3) goto Heal4;
-    goto Heal1;
+    if(@TEMP == 1) goto L_Heal2;
+    if(@TEMP == 2) goto L_Heal3;
+    if(@TEMP == 3) goto L_Heal4;
+    goto L_Heal1;
 
-Heal1:
+L_Heal1:
 
     mes "[Elanore the Healer]";
     mes "\"You don't look too well; let me treat your wounds.\"";
     next;
-    goto Heal_L;
+    goto L_Heal_L;
 
-Heal2:
+L_Heal2:
 
     mes "[Elanore the Healer]";
     mes "\"I will make quick work of your wounds.\"";
     next;
-    goto Heal_L;
+    goto L_Heal_L;
 
-Heal3:
+L_Heal3:
 
     mes "[Elanore the Healer]";
     mes "\"Need a healing?\"";
     next;
-    goto Heal_L;
+    goto L_Heal_L;
 
-Heal4:
+L_Heal4:
 
     mes "[Elanore the Healer]";
     mes "\"Sometimes you just need to run from battle.\"";
     next;
-    goto Heal_L;
+    goto L_Heal_L;
 
-Heal_L:
+L_Heal_L:
     set @TEMP,rand(4);
-    if(@TEMP == 1) goto Heal_2;
-    if(@TEMP == 2) goto Heal_3;
-    if(@TEMP == 3) goto Heal_4;
-    goto Heal_1;
+    if(@TEMP == 1) goto L_Heal_2;
+    if(@TEMP == 2) goto L_Heal_3;
+    if(@TEMP == 3) goto L_Heal_4;
+    goto L_Heal_1;
 
-Heal_1:
+L_Heal_1:
 
     mes "[Elanore the Healer]";
     mes "\"Here you go!\"";
     heal 10000,10000;
     goto L_Close;
 
-Heal_2:
+L_Heal_2:
 
     mes "[Elanore the Healer]";
     mes "\"Painless, wasn't it?";
     heal 10000,10000;
     goto L_Close;
 
-Heal_3:
+L_Heal_3:
 
     mes "[Elanore the Healer]";
     mes "\"You should be more careful.\"";
     heal 10000,10000;
     goto L_Close;
 
-Heal_4:
+L_Heal_4:
 
     mes "[Elanore the Healer]";
     mes "\"Much better, right?!\"";
@@ -164,7 +164,7 @@ OnPCKillEvent:
     goto L_OnPcKillFinish;
 
 L_OnPcKillWipe:
-        set @Q_heal_exp, 0;
+    set @Q_heal_exp, 0;
     goto L_OnPcKillFinish;
 
 L_OnPcKillFinish:
diff --git a/world/map/npc/001-1/mikhail.txt b/world/map/npc/001-1/mikhail.txt
index d0ec2f3d..b2b6d64d 100644
--- a/world/map/npc/001-1/mikhail.txt
+++ b/world/map/npc/001-1/mikhail.txt
@@ -10,8 +10,7 @@
     if (@state >= 6) goto L_Done;
     if (@state == 5) goto L_Progress;
     if (@state == 4) goto L_Start;
-    //else
-                    goto L_Convince_Mikhail_First;
+    goto L_Convince_Mikhail_First;
 
 L_Convince_Mikhail_First:
     mes "[Mikhail]";
diff --git a/world/map/npc/001-1/monster_guide.txt b/world/map/npc/001-1/monster_guide.txt
index 7df38189..eb2b10ce 100644
--- a/world/map/npc/001-1/monster_guide.txt
+++ b/world/map/npc/001-1/monster_guide.txt
@@ -11,9 +11,9 @@ Register:
     mes "[Aidan the Monster Guide]";
     mes "Oh my, you don't seem to be registered as a Quest Participant. Would you like to register?";
     next;
-    goto Choice;
+    goto L_Choice;
 
-Choice:
+L_Choice:
     menu
         "Register",L_R,
         "Not at the moment",
@@ -43,5 +43,5 @@ L_I:
     mes "[Monster Guide]";
     mes "So whaddaya say, sign up won't you?";
     next;
-    goto Choice;
+    goto L_Choice;
 }
diff --git a/world/map/npc/001-1/rewards_master.txt b/world/map/npc/001-1/rewards_master.txt
index e581b907..f078c62b 100644
--- a/world/map/npc/001-1/rewards_master.txt
+++ b/world/map/npc/001-1/rewards_master.txt
@@ -61,8 +61,6 @@ L_NotEnough:
     mes "\"You don't have enough Monster Points for a reward. You'll need to kill some more monsters first.\"";
     goto L_Close;
 
-
-
 L_Give_all:
     // we need to count how many loop iterations are done there,
     // since the server complains about more than 250 (70 according to Jaxad0127)
diff --git a/world/map/npc/003-1/stranger.txt b/world/map/npc/003-1/stranger.txt
index ead5a6a0..e264743b 100644
--- a/world/map/npc/003-1/stranger.txt
+++ b/world/map/npc/003-1/stranger.txt
@@ -347,7 +347,6 @@ L_Yellow:
     mes "\"Done! It'll use its color after being used, but just come back and I can dye it again for you.\"";
     goto L_Close;
 
-
 L_White:
     mes "[Stranger]";
     mes "\"Ok, I'll need two bags of Diamond Powder and a bottle of water for that.\"";
diff --git a/world/map/npc/005-1/spirit.txt b/world/map/npc/005-1/spirit.txt
index 02e4e3b1..187ba131 100644
--- a/world/map/npc/005-1/spirit.txt
+++ b/world/map/npc/005-1/spirit.txt
@@ -52,9 +52,7 @@ L_Next1:
     mes "[Earth Spirit]";
     mes "\"I'm an earth spirit; my name isn't important... all that matters is that I like you, and that I will help you become a powerful wizard if you help me.  Just a fair deal, no more than that...\"";
     next;
-
     set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_IMP;
-
     goto L_main;
 
 L_wb:
diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt
index 48131542..a40f4ebf 100644
--- a/world/map/npc/006-1/pachua.txt
+++ b/world/map/npc/006-1/pachua.txt
@@ -66,11 +66,10 @@ L_Super_store:
             "Snake Skin Chaps sound good.", L_BuyChaps,
             "Can you make a leather patch?", L_leather_patch,
             "Not now, maybe later.", L_NoDeal;
-    //else
-        menu
-            "Cowboy hat, please.", L_BuyCowboy,
-            "Snake Skin Chaps sound good.", L_BuyChaps,
-            "Not now, maybe later.", L_NoDeal;
+    menu
+        "Cowboy hat, please.", L_BuyCowboy,
+        "Snake Skin Chaps sound good.", L_BuyChaps,
+        "Not now, maybe later.", L_NoDeal;
 
 L_Cowboy_store:
     callsub S_CheckStuff;
@@ -88,10 +87,9 @@ L_Cowboy_store:
             "Yes, that's fine.", L_BuyCowboy,
             "Can you make a leather patch?", L_leather_patch,
             "On second thought, maybe later.", L_NoDeal;
-    //else
-        menu
-            "Yes, that's fine.", L_BuyCowboy,
-            "On second thought, maybe later.", L_NoDeal;
+    menu
+        "Yes, that's fine.", L_BuyCowboy,
+        "On second thought, maybe later.", L_NoDeal;
 
 L_Chaps_store:
     callsub S_CheckStuff;
@@ -108,10 +106,9 @@ L_Chaps_store:
         menu
             "Yes, that's fine.", L_BuyChaps,
             "On second thought, maybe later.", L_NoDeal;
-    //else
-        menu
-            "Yes, that's fine.", L_BuyChaps,
-            "Can you make a leather patch?", L_leather_patch,
+    menu
+        "Yes, that's fine.", L_BuyChaps,
+        "Can you make a leather patch?", L_leather_patch,
             "On second thought, maybe later.", L_NoDeal;
 
 L_BuyChaps:
@@ -282,8 +279,7 @@ L_MakeBasket:
 
 L_Next4:
     if(countitem("ReedBundle") < 5) goto L_EasterNotEnough;
-    //else
-                                     goto L_EasterEnough;
+    goto L_EasterEnough;
 
 L_EasterNotEnough:
     mes "[Chief Pachua]";
diff --git a/world/map/npc/007-1/voltain.txt b/world/map/npc/007-1/voltain.txt
index c05be549..b164ef45 100644
--- a/world/map/npc/007-1/voltain.txt
+++ b/world/map/npc/007-1/voltain.txt
@@ -67,23 +67,23 @@
     set @CHOCOLATECAKE_REWARD_XP,  330;
     set @CHOCOLATECAKE_REWARD_GOLD,  180;
 
-    if ($@VOLTAIN_state == 1) goto state1;
-    if ($@VOLTAIN_state == 2) goto state2;
-    if ($@VOLTAIN_state == 3) goto state3;
-    if ($@VOLTAIN_state == 4) goto state4;
-    if ($@VOLTAIN_state == 5) goto state5;
-    if ($@VOLTAIN_state == 6) goto state6;
-    if ($@VOLTAIN_state == 7) goto state7;
-    if ($@VOLTAIN_state == 8) goto state8;
-    if ($@VOLTAIN_state == 9) goto state9;
-    if ($@VOLTAIN_state == 10) goto state10;
-    if ($@VOLTAIN_state == 11) goto state11;
-    if ($@VOLTAIN_state == 12) goto state12;
-    if ($@VOLTAIN_state == 13) goto state13;
-//    default: trap through to state0!
-    goto state0;
-
-state0:
+    if ($@VOLTAIN_state == 1) goto L_state1;
+    if ($@VOLTAIN_state == 2) goto L_state2;
+    if ($@VOLTAIN_state == 3) goto L_state3;
+    if ($@VOLTAIN_state == 4) goto L_state4;
+    if ($@VOLTAIN_state == 5) goto L_state5;
+    if ($@VOLTAIN_state == 6) goto L_state6;
+    if ($@VOLTAIN_state == 7) goto L_state7;
+    if ($@VOLTAIN_state == 8) goto L_state8;
+    if ($@VOLTAIN_state == 9) goto L_state9;
+    if ($@VOLTAIN_state == 10) goto L_state10;
+    if ($@VOLTAIN_state == 11) goto L_state11;
+    if ($@VOLTAIN_state == 12) goto L_state12;
+    if ($@VOLTAIN_state == 13) goto L_state13;
+//    default: trap through to L_state0!
+    goto L_state0;
+
+L_state0:
     mes "[Voltain]";
     mes "\"What are you doing bothering me? Can't you see I'm busy! Oh, I'm sorry, I thought you were my assistant. Never mind that... would you care to help me?\"";
     next;
@@ -109,14 +109,14 @@ L_Next1:
     mes "\"Thanks for the bottles. Much easier to carry liquid in them.\"";
     goto L_Close;
 
-state1:
-mes "[Voltain]";
-mes "\"I'm making a potion that requires lots of venom. I'm in need of " + @BLACK_SC_ST_NEEDED + " black scorpion stingers.\"";
-next;
+L_state1:
+    mes "[Voltain]";
+    mes "\"I'm making a potion that requires lots of venom. I'm in need of " + @BLACK_SC_ST_NEEDED + " black scorpion stingers.\"";
+    next;
 
-menu
-    "I've got the stingers!", L_Next2,
-    "I'll go search for them.", L_Close;
+    menu
+        "I've got the stingers!", L_Next2,
+        "I'll go search for them.", L_Close;
 
 L_Next2:
     mes "[Voltain]";
@@ -129,7 +129,7 @@ L_Next2:
     mes "\"Well, since you went to the trouble of getting me these here's a little something for your time...\"";
     goto L_Close;
 
-state2:
+L_state2:
     mes "[Voltain]";
     mes "\"Care to to help me with my potion? I need " + @BUGLEG_NEEDED + " bug legs so that I can thicken the potion.\"";
     next;
@@ -148,7 +148,7 @@ L_Next3:
     mes "\"Great! My potion is ready to poison the moub...I mean cure scorpion stings. \"";
     goto L_Close;
 
-state3:
+L_state3:
     mes "[Voltain]";
     mes "\"I find myself in need of a black scorpion stinger... Damn mouboo are hard to kill...forget you heard that.\"";
     next;
@@ -166,7 +166,7 @@ L_Next4:
     mes "\"Great! Now I can really kill that monster!\"";
     goto L_Close;
 
-state4:
+L_state4:
     mes "[Voltain]";
     mes "\"I need to thicken a veno.. Oh, a potion actually. I want to try mauve herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
     next;
@@ -185,7 +185,7 @@ L_Next5:
     mes "\"Great! Now I can thicken the potion! I will try directly.\"";
     goto L_Close;
 
-state5:
+L_state5:
     mes "[Voltain]";
     mes "\"Hello I am looking for " + @RAWLOG_NEEDED + " raw logs, maybe you could help me getting some? I want to try to build a mouboo trap.. Uhm actually no! I want to build a device to destroy these traps. So can you help me?\"";
     next;
@@ -204,7 +204,7 @@ L_Next6:
     mes "\"Great! Now I can thicken the potion! I will try directly.\"";
     goto L_Close;
 
-state6:
+L_state6:
     mes "[Voltain]";
     mes "\"Hello I am looking for " + @REDAPPLE_NEEDED + " red apples, maybe I can inject some venoms.. DOH not this again! Of course I meant a strength potion. Did you hear about the new potions from Caul? He is a pretty good alchimist. He can do strength potions, can't he?\"";
     next;
@@ -223,7 +223,7 @@ L_Next7:
     mes "\"Very well, this will be useful.\"";
     goto L_Close;
 
-state7:
+L_state7:
     mes "[Voltain]";
     mes "\"I need to thicken a veno.. Oh, a potion actually. Cobalt herbs might be good for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
     next;
@@ -242,7 +242,7 @@ L_Next8:
     mes "\"Great! Now I can go on with the ven-  the experiments for the welfare of humanity, I mean.\"";
     goto L_Close;
 
-state8:
+L_state8:
     mes "[Voltain]";
     mes "\"I am in need of snake tongues. They can help me getting very strong venom extracts. So I would like you to bring me " + @SNAKETONGUE_NEEDED + " snake tongues.\"";
     next;
@@ -261,7 +261,7 @@ L_Next9:
     mes "\"Excellent, now I can extract the venom to- uhm, nevermind. Thanks for your help.\"";
     goto L_Close;
 
-state9:
+L_state9:
     mes "[Voltain]";
     mes "\"I need to thicken a veno.. Oh, a potion actually. I want to try alizarin herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
     next;
@@ -280,7 +280,7 @@ L_Next10:
     mes "\"Great! Now I can thicken the potion! I will try directly.\"";
     goto L_Close;
 
-state10:
+L_state10:
     mes "[Voltain]";
     mes "\"Oh I am hungry. Maybe I can eat some steaks. Could you bring me a steak,  please?\"";
     next;
@@ -301,7 +301,7 @@ L_Next11:
     mes "\"Thanks a lot. I will really enjoy my meal.\"";
     goto L_Close;
 
-state11:
+L_state11:
     mes "[Voltain]";
     mes "\"Could I have some arrows please? I have lost my hunting equipment when I was in the caves. Some dark creatures were chasing me!\"";
     next;
@@ -321,7 +321,7 @@ L_Next12:
     mes "\"Thanks a lot. Now I feel more secure here in the outdoors.\"";
     goto L_Close;
 
-state12:
+L_state12:
     mes "[Voltain]";
     mes "\"I need to thicken a veno.. Oh, a potion actually. I want to try gamboge herbs for that, so can you bring me " + @HERBS_NEEDED + ", please?\"";
     next;
@@ -340,7 +340,7 @@ L_Next13:
     mes "\"Great! Now I can thicken the potion! I will try directly.\"";
     goto L_Close;
 
-state13:
+L_state13:
     mes "[Voltain]";
     mes "\"Doing so many ev- good things makes me hungry. I feel in the mood for a Chocolate Cake. Can you bring me " + @CHOCOLATECAKE_NEEDED + ",  please? \"";
     next;
diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index f65bafb1..b98b27e2 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -942,9 +942,7 @@ L_Torch2:
 
 L_Torch1:
     enablenpc "#IlliaTorch1";
-
-return;
-
+    return;
 }
 
 007-1.gat,72,88,0|script|#IlliaTorch1|374,
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index 0f8e55c0..d42be802 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -38,14 +38,14 @@ function|script|AnnualEasterEvent|,
     // give out a better reward occasionally:
     // standard case is branch taken, so only if rand yields 0, medium rewarding.
     if (rand($@EASTER_EGG_INV_CHANCE))
-        goto NoEasterEgg;
+        goto L_NoEasterEgg;
 
     set @random, rand(getarraysize($@MediumAnnualEasterRewards$));
     getitem $@MediumAnnualEasterRewards$[@random], 1;
     misceffect FX_GETITEM, strcharinfo(0);
-    goto NoEasterEgg;
+    goto L_NoEasterEgg;
 
-NoEasterEgg:
+L_NoEasterEgg:
 
     // If you're lucky you get a bigger unique reward per year:
     // so only pass on a small chance iff you don't have the item yet.
diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt
index 7c29ef75..0071c7e7 100644
--- a/world/map/npc/009-2/airlia.txt
+++ b/world/map/npc/009-2/airlia.txt
@@ -54,10 +54,10 @@ L_Caretaker:
             "Sorry, no.", L_Next,
             "My what?", L_Caretaker_mount;
     //else ==
-        menu
-            "Sorry, no.", L_Next,
-            "I have a letter from your father.", L_Caretaker_first_reward,
-            "My what?", L_Caretaker_mount;
+    menu
+        "Sorry, no.", L_Next,
+        "I have a letter from your father.", L_Caretaker_first_reward,
+        "My what?", L_Caretaker_mount;
     goto L_Next;
 
 L_Next:
diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt
index ba9e1f30..6d39e3e2 100644
--- a/world/map/npc/009-2/alan.txt
+++ b/world/map/npc/009-2/alan.txt
@@ -35,10 +35,9 @@
             "OK, thanks.", L_Close,
             "Can you make me a really good bow?", L_State_0_1,
             "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-    //else
-        menu
-            "OK, thanks.", L_Close,
-            "Can you make me a really good bow?", L_State_0_1;
+    menu
+        "OK, thanks.", L_Close,
+        "Can you make me a really good bow?", L_State_0_1;
 
 L_State_0_1:
     mes "[Alan]";
@@ -84,10 +83,9 @@ L_State_1:
             "No, I haven't had the time yet.", L_Close,
             "No, I didn't find him yet.", L_State_1_1,
             "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-    //else
-        menu
-            "No, I haven't had the time yet.", L_Close,
-            "No, I didn't find him yet.", L_State_1_1;
+    menu
+        "No, I haven't had the time yet.", L_Close,
+        "No, I didn't find him yet.", L_State_1_1;
 
 L_State_1_1:
     mes "[Alan]";
@@ -102,9 +100,8 @@ L_State_2:
         menu
             "Yes, I did. He said that the trees turned into dangerous monsters.", L_Foo,
             "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-    //else
-        menu
-            "Yes, I did. He said that the trees turned into dangerous monsters.", L_Foo;
+    menu
+        "Yes, I did. He said that the trees turned into dangerous monsters.", L_Foo;
 L_Foo:
     mes "[Alan]";
     mes "\"Oh, that's really bad news. Maybe you can do his job?";
@@ -125,10 +122,9 @@ L_State_3:
             "Here, take a look!", L_State_3_try,
             "Yes, but I need it for something else.", L_Close,
             "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-    //else
-        menu
-            "Here, take a look!", L_State_3_try,
-            "Yes, but I need it for something else.", L_Close;
+    menu
+        "Here, take a look!", L_State_3_try,
+        "Yes, but I need it for something else.", L_Close;
 
 L_State_3_try:
     if (countitem("RawLog") < 1)
@@ -171,10 +167,9 @@ L_State_4:
             "10,000??? What a ripoff!", L_Close,
             "Sure, here you go!", L_State_4_pay,
             "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
-    //else
-        menu
-            "10,000??? What a ripoff!", L_Close,
-            "Sure, here you go!", L_State_4_pay;
+    menu
+        "10,000??? What a ripoff!", L_Close,
+        "Sure, here you go!", L_State_4_pay;
 
 L_State_4_pay:
     if (Zeny < 10000)
diff --git a/world/map/npc/009-2/doctor.txt b/world/map/npc/009-2/doctor.txt
index e9905c77..d3f5a1c5 100644
--- a/world/map/npc/009-2/doctor.txt
+++ b/world/map/npc/009-2/doctor.txt
@@ -18,10 +18,9 @@
             "I think I am sick!", L_Cure,
             "No, I feel fine.", L_Next,
             "Have you seen anything strange in town? Anything that might have to do with the robberies?", L_NohMask;
-    //else
-        menu
-            "I think I am sick!", L_Cure,
-            "No, I feel fine.", L_Next;
+    menu
+        "I think I am sick!", L_Cure,
+        "No, I feel fine.", L_Next;
 
 L_Next:
     mes "[Doctor]";
diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt
index 8c105b02..edcb2321 100644
--- a/world/map/npc/009-2/nicholas.txt
+++ b/world/map/npc/009-2/nicholas.txt
@@ -324,7 +324,6 @@ L_WhereLeather:
     mes "\"Hmm.  You should look for someone who can work with some kind of leather.  Rumor has it that there is someone in the eastern desert who can, but I haven't been there.\"";
     close;
 
-
 L_SetzerQuest:
     mes "[Nicholas]";
     if (@Q_SETZER_status & @SETZER_FLAG_MADE_SETZER)
diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt
index 3fbbc536..2320297e 100644
--- a/world/map/npc/009-2/nurse.txt
+++ b/world/map/npc/009-2/nurse.txt
@@ -66,11 +66,10 @@ L_Usual:
             "I don't feel so well, I might be sick.", L_Doctor,
             "Have you seen anything out of the ordinary?", L_NohMask,
             "No, I'm fine.", L_Next;
-    //else
-        menu
-            "Oooh, these wounds! They hurt so much!", L_Heal,
-            "I don't feel so well, I might be sick.", L_Doctor,
-            "No, I'm fine.", L_Next;
+    menu
+        "Oooh, these wounds! They hurt so much!", L_Heal,
+        "I don't feel so well, I might be sick.", L_Doctor,
+        "No, I'm fine.", L_Next;
 
 L_Next:
     mes "[Nurse]";
diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt
index adcc7f6e..da2b8dc5 100644
--- a/world/map/npc/009-2/wyara.txt
+++ b/world/map/npc/009-2/wyara.txt
@@ -47,12 +47,11 @@ L_Main:
             "Can you help me learn magic?", L_Magic,
             "I would like to buy potions.", L_Shop,
             "Bye!", L_Close;
-    //else
-        menu
-            "What do you know about...", L_Question,
-            "Can you help me learn magic?", L_Magic,
-            "I would like to buy potions.", L_Shop,
-            "Bye!", L_Close;
+    menu
+        "What do you know about...", L_Question,
+        "Can you help me learn magic?", L_Magic,
+        "I would like to buy potions.", L_Shop,
+        "Bye!", L_Close;
 
 L_Shop:
     mes "[Wyara the Witch]";
diff --git a/world/map/npc/009-3/warp.txt b/world/map/npc/009-3/warp.txt
index 8bb52a30..db1146e8 100644
--- a/world/map/npc/009-3/warp.txt
+++ b/world/map/npc/009-3/warp.txt
@@ -8,8 +8,7 @@
 L_Next:
     if (Zeny < 150)
         goto L_NotEnoughMoney;
-    //else
-        goto L_Pay;
+    goto L_Pay;
 
 L_Exit:
     close;
diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt
index eadd7170..5bd032e4 100644
--- a/world/map/npc/009-6/brodomir.txt
+++ b/world/map/npc/009-6/brodomir.txt
@@ -179,7 +179,6 @@ L_Warpfail:
         goto L_Cleanup;
     if (attachrid($@BRODOMIR_SPONSOR) == 0)
         goto L_SkipItemback;
-
     // we need this loop because for items that can't be stacked, getitem will stack them nevertheless
     goto L_GetitemLoop;
 
@@ -209,7 +208,6 @@ OnReward:
     set Zeny, Zeny + ($@BRODOMIR_MONEY + 150 * $@BRODOMIR_PLAYERS);
     if ($@BRODOMIR_ITEM_AMOUNT == 0 || $@BRODOMIR_ITEM$ == "")
         goto L_SkipItem;
-
     // we need this loop because for items that can't be stacked, getitem will stack them nevertheless
     goto L_Getitem;
 
diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt
index 20ef0dcf..a128b094 100644
--- a/world/map/npc/010-2/chef.txt
+++ b/world/map/npc/010-2/chef.txt
@@ -277,8 +277,7 @@ L_Easter2012_Result:
 
 L_Next8:
     if (@temp < 15) goto L_Easter2012_Lucky;
-    //else
-                     goto L_Easter2012_Unlucky;
+    goto L_Easter2012_Unlucky;
     close;
 
 L_Easter2012_Lucky:
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index d422cf03..e51213ae 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -382,7 +382,7 @@ event_done:
     next;
     mes "\"Well, that was the poem.  What do you think of it?\"";
     menu
-        "It was a bit long and kind of hard to understand, but thanks for reading.", leave;
+        "It was a bit long and kind of hard to understand, but thanks for reading.", L_Close;
 
 L_Full_Inv:
     mes "[Shannon]";
@@ -463,28 +463,28 @@ L_nobeer:
 L_MenuItems:
     set @choose, @menu - 1;
     if (@choice_idx[@choose] == 0)
-        goto leave;
+        goto L_Close;
     if ((countitem("Steak") != 0) && (@choice_idx[@choose] == @C_steak))
-        goto rem_item;
+        goto L_RmItem;
     if ((countitem("ChickenLeg") != 0) && (@choice_idx[@choose] == @C_chickenleg))
-        goto rem_item;
+        goto L_RmItem;
     if ((countitem("RedApple") != 0) && (@choice_idx[@choose] == @C_redapple))
-        goto rem_item;
+        goto L_RmItem;
     if ((countitem("GreenApple") != 0) && (@choice_idx[@choose] == @C_greenapple))
-        goto rem_item;
+        goto L_RmItem;
     if ((countitem("Beer") != 0) && (@choice_idx[@choose] == @C_beer))
-        goto rem_item;
+        goto L_RmItem;
 
     // fallthrough only when player remove the items while in menu, trying to cheat
     // the quest will need to be started again
     mes "\"What you are offering, you do not have.  Do not try to betray me. Come back when you have better morals.\"";
     close;
 
-rem_item:
+L_RmItem:
     delitem @choice_idx[@choose], 1;
     return;
 
-leave:
+L_Close:
     close;
 }
 
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index a6b4c06f..35cf3af7 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -160,11 +160,11 @@ L_agostine_2:
             "Are you alright?", L_Next,
             "Here, have a bottle of water...", L_give_water,
             "Can I help you?", L_Next;
-    //else
-        menu
-            "(sneak out of the room)", L_end,
-            "Are you alright?", L_Next,
-            "Can I help you?", L_Next;
+
+    menu
+        "(sneak out of the room)", L_end,
+        "Are you alright?", L_Next,
+        "Can I help you?", L_Next;
 
 L_Next:
     mes "[Lora Tay the Seamstress]";
@@ -328,7 +328,6 @@ L_Next4:
     mes "\"I will fix them, but I cannot use normal threading to fix these materials.";
     mes "I will need a soft thin thread so I won't spoil the textures.\"";
     next;
-
     goto L_proposal_search_items;
 
 L_proposal_search_items:
@@ -1116,5 +1115,4 @@ L_CleanSorcererRobe:
     set @chosen_color, 0;
     set @cotton_cloth_id, 0;
     close;
-
 }
diff --git a/world/map/npc/011-1/alchemist.txt b/world/map/npc/011-1/alchemist.txt
index 9b0dc795..de66be6a 100644
--- a/world/map/npc/011-1/alchemist.txt
+++ b/world/map/npc/011-1/alchemist.txt
@@ -1022,7 +1022,6 @@ L_Next3:
 L_abort:
     close;
 
-
 L_Update_Var:
     set QUEST_Forestbow_state,
         (QUEST_Forestbow_state & ~(@Q_MASK)
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 5b300e71..b5ea7f1d 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -166,14 +166,13 @@ L_main_menu_magic:
             "What do you know about...", L_question,
             "Can you make sulphur powder?", L_sulphur,
             "Goodbye.", L_Close;
-    //else
-        menu
-            "How does magic work?", L_about_magic,
-            "Can you teach me a spell?", L_learn_spell,
-            "Where are you from?", L_about_auldsbel,
-            "Do you need help with your experiments?", L_quest,
-            "What do you know about...", L_question,
-            "Goodbye.", L_Close;
+    menu
+        "How does magic work?", L_about_magic,
+        "Can you teach me a spell?", L_learn_spell,
+        "Where are you from?", L_about_auldsbel,
+        "Do you need help with your experiments?", L_quest,
+        "What do you know about...", L_question,
+        "Goodbye.", L_Close;
 
 L_ironpowder:
     mes "[Auldsbel the Wizard]";
@@ -195,11 +194,10 @@ L_sulphur:
             "I will see what I can find.", L_Close,
             "Can you teach me how to make it myself?", L_sulphur_teach_spell,
             "Here you are.", L_sulphur_buy;
-    //else
-        menu
-            "No, thank you.", L_Close,
-            "I will see what I can find.", L_Close,
-            "Here you are.", L_sulphur_buy;
+    menu
+        "No, thank you.", L_Close,
+        "I will see what I can find.", L_Close,
+        "Here you are.", L_sulphur_buy;
 
 L_sulphur_buy:
     if (Zeny < @cost)
@@ -968,23 +966,23 @@ L_component_quest_missing:
 
 L_learn_spell:
     if (@Q_main_status == @Q_STATUS_INITIATION)
-        goto LL_initiation;
+        goto L_initiation;
     if (@Q_main_status == @Q_STATUS_STUDENT)
-        goto LL_student_start;
+        goto L_student_start;
     if (@Q_main_status == @Q_STATUS_STUDENT0)
-        goto LL_student_0;
+        goto L_student_0;
     if (@Q_main_status == @Q_STATUS_STUDENT1)
-        goto LL_student_1;
+        goto L_student_1;
     if (@Q_main_status == @Q_STATUS_STUDENT2)
-        goto LL_student_2;
+        goto L_student_2;
     if (@Q_main_status == @Q_STATUS_STUDENT3)
-        goto LL_student_3;
+        goto L_student_3;
     if (@Q_main_status == @Q_STATUS_STUDENT4)
-        goto LL_student_4;
+        goto L_student_4;
     if (@Q_main_status == @Q_STATUS_STUDENT5)
-        goto LL_student_5;
+        goto L_student_5;
     if (@Q_main_status == @Q_STATUS_STUDENT6)
-        goto LL_student_6;
+        goto L_student_6;
 
     mes "[Auldsbel the Wizard]";
     mes "\"Wellll.... you do seem to have some magical abilities.  But do you possess the talent and diligence needed for a true wizard?\"";
@@ -1010,7 +1008,7 @@ L_learn_spell:
     callsub S_update_var;
     goto L_main_menu;
 
-LL_repeat_spell:
+L_repeat_spell:
     mes "[Auldsbel the Wizard]";
     mes "\"The invocation is `" + getspellinvocation("transmute-wood-to-figurine") + ",' followed by the last syllable of the name of the creature you want to shape the log into.  So `" + getspellinvocation("transmute-wood-to-figurine") + " lurk' for a Skrytlurk figurine.\"";
     next;
@@ -1022,20 +1020,19 @@ LL_repeat_spell:
     next;
     goto L_main_menu;
 
-LL_initiation:
+L_initiation:
     mes "[Auldsbel the Wizard]";
     mes "\"So, have you managed to transmute something?\"";
     next;
     if (countitem("MoubooFigurine"))
         menu
             "Not yet.", L_main_menu,
-            "How about this mouboo figurine?", LL_initiation_check;
-    //else
-        menu
-            "Not yet.", L_main_menu,
-            "What was the spell again?", LL_repeat_spell;
+            "How about this mouboo figurine?", L_initiation_check;
+    menu
+        "Not yet.", L_main_menu,
+        "What was the spell again?", L_repeat_spell;
 
-LL_initiation_fail:
+L_initiation_fail:
     mes "[Auldsbel the Wizard]";
     mes "\"No, no, no.  This is no good-- too many imperfections.\"";
     mes "He throws it away.";
@@ -1043,7 +1040,7 @@ LL_initiation_fail:
     next;
     goto L_main_menu;
 
-LL_initiation_check:
+L_initiation_check:
     if (!(countitem("MoubooFigurine")))
         goto L_main_menu;
     delitem "MoubooFigurine", 1;
@@ -1051,7 +1048,7 @@ LL_initiation_check:
     mes "Auldsbel inspects your figurine.";
     next;
     if (@mexp < 40)
-        goto LL_initiation_fail;
+        goto L_initiation_fail;
     mes "[Auldsbel the Wizard]";
     mes "Auldsbel nods.";
     mes "\"This looks good.\"";
@@ -1076,8 +1073,8 @@ LL_initiation_check:
     next;
     goto L_main_menu;
 
-LL_student_start:
-    if (@mexp < 200) goto LL_notready;
+L_student_start:
+    if (@mexp < 200) goto L_notready;
         mes "[Auldsbel the Wizard]";
     mes "\"Next, I shall teach you a higher-level transmutation spell.\"";
     if (getskilllv(SKILL_MAGIC) < 2)
@@ -1111,15 +1108,15 @@ L_Next9:
     next;
     goto L_main_menu;
 
-LL_notready:
+L_notready:
     mes "[Auldsbel the Wizard]";
     mes "\"You still need more practice with spellcasting; I won't give you another spell until you are ready.\"";
     next;
     goto L_main_menu;
 
-LL_student_0:
+L_student_0:
     if (@mexp < 350)
-        goto LL_notready;
+        goto L_notready;
     mes "[Auldsbel the Wizard]";
     mes "\"The next transmutation spell is a little harder than the last one I taught you, but you should be able to manage.\"";
     next;
@@ -1147,9 +1144,9 @@ L_Next10:
     next;
     goto L_main_menu;
 
-LL_student_1:
+L_student_1:
     if (@mexp < 425)
-        goto LL_notready;
+        goto L_notready;
     mes "[Auldsbel the Wizard]";
     mes "\"Up next is the transmutation spell for regular shirts.\"";
     next;
@@ -1177,9 +1174,9 @@ L_Next11:
     next;
     goto L_main_menu;
 
-LL_student_2:
+L_student_2:
     if (@mexp < 500)
-        goto LL_notready;
+        goto L_notready;
     mes "[Auldsbel the Wizard]";
     mes "\"You may find the next spell particularly useful.\"";
     next;
@@ -1207,14 +1204,15 @@ L_Next12:
     next;
     goto L_main_menu;
 
-LL_student_3:
+L_student_3:
     if (getskilllv(SKILL_MAGIC) < 3)
-        goto LL_magic_skill_insufficient;
+        goto L_magic_skill_insufficient;
     mes "[Auldsbel the Wizard]";
     mes "\"I believe that you may be ready for the next level of transmutation magic!  Let me teach you one last spell that you can handle before your promotion, and if you can cast this one, I will advance you.\"";
     next;
+    goto L_student_3_repeat;
 
-LL_student_3_repeat:
+L_student_3_repeat:
     mes "[Auldsbel the Wizard]";
     mes "\"This one has the invocation `" + getspellinvocation("make-concentration-potion") + "'.  Put two cobalt leaves and two pink flower petals into a bottle of water, hold it up, and speak that phrase.\"";
     next;
@@ -1228,20 +1226,20 @@ LL_student_3_repeat:
     callsub S_update_var;
     goto L_main_menu;
 
-LL_student_4:
+L_student_4:
     mes "[Auldsbel the Wizard]";
     mes "\"Did you manage to transmute a concentration potion?\"";
     next;
     menu
-        "What was the invocation again?", LL_student_3_repeat,
+        "What was the invocation again?", L_student_3_repeat,
         "No, still working on it...", L_main_menu,
         "Yes.", L_Next13;
 
 L_Next13:
     if (countitem("ConcentrationPotion") < 1)
-        goto LL_student_4_no_potion;
+        goto L_student_4_no_potion;
     if (!(MAGIC_FLAGS & MFLAG_MADE_CONC_POTION))
-        goto LL_student_4_wrong_potion;
+        goto L_student_4_wrong_potion;
     mes "[Auldsbel the Wizard]";
     mes "Auldsbel examines your potion and nods.";
     mes "\"Good work!  You are ready for a promotion!\"";
@@ -1262,25 +1260,25 @@ L_Next13:
     next;
     goto L_main_menu;
 
-LL_student_4_wrong_potion:
+L_student_4_wrong_potion:
     mes "[Auldsbel the Wizard]";
     mes "Auldsbell examines your potion, then shakes his head.";
     mes "\"This doesn't look quite right, though I can't quite point at what the problem is.  You will have to continue trying.\"";
     next;
     goto L_main_menu;
 
-LL_student_4_no_potion:
+L_student_4_no_potion:
     mes "[Auldsbel the Wizard]";
     mes "\"You seem to be rather lacking the concentration potion you need to justify your claim, my dear fellow.\"";
     next;
     goto L_main_menu;
 
-LL_student_5:
+L_student_5:
     mes "[Auldsbel the Wizard]";
     mes "\"Hmm.  Come back some other time, please; I still haven't figured out what to teach you next.\"";
     close;
 
-LL_magic_skill_insufficient:
+L_magic_skill_insufficient:
     mes "[Auldsbel the Wizard]";
     mes "\"No, not at this time.  You will have to advance in your overall magic skill before I can teach you more.\"";
     next;
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index e3901a12..2927c5e8 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -508,5 +508,4 @@ L_InventoryFull:
     mes "\"Ah, but you cannot carry anything else!";
     mes "Make some room first.\"";
     goto L_End;
-
 }
diff --git a/world/map/npc/013-1/sagatha.txt b/world/map/npc/013-1/sagatha.txt
index 44d531b2..92925dae 100644
--- a/world/map/npc/013-1/sagatha.txt
+++ b/world/map/npc/013-1/sagatha.txt
@@ -115,7 +115,7 @@ L_next:
         "Who are you?", L_Next,
         "What's your name?", L_intro_name,
         "Hello!  My name is " + strcharinfo(0) + ".", L_intro_givename,
-        "Goodbye.", L_close;
+        "Goodbye.", L_Close;
 
 L_Next:
     mes "[Witch]";
@@ -124,7 +124,7 @@ L_Next:
     menu
         "No, I mean... what's your name?", L_intro_name,
         "Hello!  My name is " + strcharinfo(0) + ".", L_intro_givename,
-        "Uh.... goodbye.", L_close;
+        "Uh.... goodbye.", L_Close;
 
 L_hat_attack:
     mes "The witch seems to be trembling with disgust as she stares at your headgear.";
@@ -155,7 +155,7 @@ L_intro_givename:
     next;
     menu
         "What's yours?", L_intro_name,
-        "Uhm... bye.", L_close;
+        "Uhm... bye.", L_Close;
 
 L_evil:
     mes "The witch's eyes flare up in anger as she notices you, and she turns away from you.";
@@ -184,13 +184,12 @@ L_main:
             "Can you explain magic to me?", L_explain_magic,
             "Can you teach me more magic?", L_teach,
             "What do you know about...", L_Question,
-            "Goodbye.", L_close;
-    //else
-        menu
-            "Can you explain magic to me?", L_explain_magic,
-            "Can you teach me magic?", L_teach_initial,
-            "What do you know about...", L_Question,
-            "Goodbye.", L_close;
+            "Goodbye.", L_Close;
+    menu
+        "Can you explain magic to me?", L_explain_magic,
+        "Can you teach me magic?", L_teach_initial,
+        "What do you know about...", L_Question,
+        "Goodbye.", L_Close;
 
 L_teach_initial:
     if (@good < 2)
@@ -431,7 +430,7 @@ L_Q_auldsbel:
     next;
     goto L_main;
 
-L_close:
+L_Close:
     close;
 
 S_up_astral:
diff --git a/world/map/npc/013-2/wizard.txt b/world/map/npc/013-2/wizard.txt
index 6f2fd8c7..042ab1f7 100644
--- a/world/map/npc/013-2/wizard.txt
+++ b/world/map/npc/013-2/wizard.txt
@@ -30,10 +30,9 @@ L_Thanks:
             "Alright.", L_Agree,
             "I am studying magic, can you help?", L_NewStudent,
             "Your apprentice? ... No thanks.", L_Decline;
-    //else
-        menu
-            "Alright.", L_Agree,
-            "Your apprentice? ... No thanks.", L_Decline;
+    menu
+        "Alright.", L_Agree,
+        "Your apprentice? ... No thanks.", L_Decline;
 
 L_Decline:
     mes "[Old Wizard]";
@@ -46,15 +45,14 @@ L_NewStudent:
     next;
 
     // check if the player has the knowledge of any skill
-    if (!(getskilllv(SKILL_POOL)))
-        menu
-            "That would be very kind of you!", L_TeachSpell,
-            "No, but thank you!", L_Decline;
-    //else
+    if (getskilllv(SKILL_POOL))
         menu
             "That would be very kind of you!", L_TeachSpell,
             "Actually I am looking for someone teaching me some more magic skills.", L_AstralSoul,
             "No, but thank you!", L_Decline;
+    menu
+        "That would be very kind of you!", L_TeachSpell,
+        "No, but thank you!", L_Decline;
 
 L_TeachSpell:
     mes "[Old Wizard]";
diff --git a/world/map/npc/015-1/sword.txt b/world/map/npc/015-1/sword.txt
index 42db0870..9a9a9ffd 100644
--- a/world/map/npc/015-1/sword.txt
+++ b/world/map/npc/015-1/sword.txt
@@ -217,7 +217,6 @@ L_Next1:
     next;
     goto L_Farewell;
 
-
 L_Levelup2_must_reg:
     mes "[Mystic Sword]";
     mes "\"To learn further magic, thou must advance in the school of war magic.  I shall grant thee this advance if thou provest thy worthiness as a warrior.\"";
diff --git a/world/map/npc/016-1/gwendolyn.txt b/world/map/npc/016-1/gwendolyn.txt
index 2879db9a..828acff3 100644
--- a/world/map/npc/016-1/gwendolyn.txt
+++ b/world/map/npc/016-1/gwendolyn.txt
@@ -248,21 +248,25 @@ L_wp0:
     mes "\"You're lucky. It is windless now.\"";
     next;
     goto L_choose_start_pos;
+
 L_wp1:
     mes "[Gwendolyn Bowmaker]";
     mes "\"There is a slight breeze coming from "+  @wd$[@wdIndex] + ".\"";
     next;
     goto L_choose_start_pos;
+
 L_wp2:
     mes "[Gwendolyn Bowmaker]";
     mes "\"The wind is blowing from "+  @wd$[@wdIndex] + ".\"";
     next;
     goto L_choose_start_pos;
+
 L_wp3:
     mes "[Gwendolyn Bowmaker]";
     mes "\"Right now, there is a strong wind blowing from " +  @wd$[@wdIndex] + ".\"";
     next;
     goto L_choose_start_pos;
+
 L_wp4:
     mes "[Gwendolyn Bowmaker]";
     mes "\"Here we have a squall from "+  @wd$[@wdIndex] + ".\"";
@@ -577,7 +581,6 @@ S_getDirection:
     if( @paramX==0 && @paramY==0 ) set @returnIndex, 5;
     return;
 }
-
 ////////////////////////////////////
 // rand(X) returns a random number uniformly distributed between in range [0; X-1]
 //
@@ -589,5 +592,3 @@ S_getDirection:
 // A+B => 0+0, 1+0, 0+1, 1+1 => [0,1,2]    25% for 0    50 % for 1    25 % for 2
 //
 // rand(3) => [0,1,2]   33% for 0    33% for 1    33% for 2
-
-
diff --git a/world/map/npc/017-4/waric.txt b/world/map/npc/017-4/waric.txt
index 81401847..b5cd26a4 100644
--- a/world/map/npc/017-4/waric.txt
+++ b/world/map/npc/017-4/waric.txt
@@ -368,9 +368,9 @@ L_Banished:
     goto L_Close;
 
 L_NoItem:
- mes "[Waric]";
- mes "\"Why are you wasting my time? Come back when you got everything I need.\"";
- goto L_Close;
+    mes "[Waric]";
+    mes "\"Why are you wasting my time? Come back when you got everything I need.\"";
+    goto L_Close;
 
 L_Close:
     set @killed_mouboo, 0;
diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt
index e8143971..73b701f2 100644
--- a/world/map/npc/018-2/caul.txt
+++ b/world/map/npc/018-2/caul.txt
@@ -110,12 +110,12 @@ L_MenuItems:
     if (@choice == @C_dementiapotion)
         goto L_DemPotion;
     if (@choice == @C_bye)
-        goto L_close;
+        goto L_Close;
 
     // otherwise the choice is the number of potions-to-brew
     set @num, @choice;
     if (@num == 0)
-        goto L_close;
+        goto L_Close;
     goto L_brew;
 
 L_brew:
@@ -188,7 +188,7 @@ L_monster_oil_start:
     next;
     if (@Q_status == @SETZER_KNOWS_OIL)
         menu
-            "OK, I'll ask around, perhaps someone else knows.", L_close;
+            "OK, I'll ask around, perhaps someone else knows.", L_Close;
     if (@Q_status > @SETZER_KNOWS_OIL)
         menu
             "Rauk told me the recipe.", L_monster_oil_knows_recipe;
@@ -209,7 +209,7 @@ L_monster_oil_main_menu:
         "How does this work?", L_monster_oil_explain,
         "Let's start!", L_monster_oil_start_brew,
         "Where can I get a golden scorpion stinger?", L_monster_oil_where_gold,
-        "I've changed my mind.", L_close;
+        "I've changed my mind.", L_Close;
 
 L_monster_oil_why_dangerous:
     mes "[Caul]";
@@ -456,7 +456,6 @@ L_monster_oil_auto_bad:
         next;
     if (@bubble_mode > 2)
         goto L_monster_oil_explode;
-
     return;
 
 L_monster_oil_explode:
@@ -522,7 +521,7 @@ L_mopox_cure_overview_menu:
         "I'm ready!", L_mopox_cure_setup,
         "What are the ingredients?", L_mopox_cure_ingredients,
         "How does this work?", L_mopox_cure_howto,
-        "I'd rather not try.", L_close;
+        "I'd rather not try.", L_Close;
 
 L_mopox_cure_ingredients:
     mes "[Caul]";
@@ -752,7 +751,7 @@ L_DemPotion:
     menu
         "Please explain to me what you know about that potion.", L_explain_dempo,
         "Ok, I will start brewing.", L_brew_dempo_init,
-        "Nevermind", L_close;
+        "Nevermind", L_Close;
 
 L_explain_dempo:
     mes "[Caul]";
@@ -1003,7 +1002,7 @@ L_ask_quit:
     mes "[Caul]";
     mes "\"The potion is not ready. You can't just leave now!\"";
     menu
-        "Please throw away that stupid potion, I'm in a hurry!", L_close,
+        "Please throw away that stupid potion, I'm in a hurry!", L_Close,
         "Oh you are right, let me finish it.", L_brew_dempo;
 
 L_check_explosion:
@@ -1083,9 +1082,9 @@ L_calc_dempo_color:
 L_NohMask:
     mes "[Caul]";
     mes "\"I'm sorry, but I didn't. I'm staying in town. Try asking one of the miners.\"";
-    goto L_close;
+    goto L_Close;
 
-L_close:
+L_Close:
     set @inspector, 0;
     close;
 
diff --git a/world/map/npc/020-2/baktar.txt b/world/map/npc/020-2/baktar.txt
index 822da870..91e1b7e0 100644
--- a/world/map/npc/020-2/baktar.txt
+++ b/world/map/npc/020-2/baktar.txt
@@ -95,13 +95,13 @@
         "Good bye", L_Close;
 
 L_KnowAlready:
-        mes @npcname$;
-        mes "\"I love Tulimshar's stuff.  I'm collecting souvenirs from Tulimshar to help remind me of all the great times I had there.  If you give me an interesting item from the area, I'll give you a nice reward.  So, you have a new item?\"";
+    mes @npcname$;
+    mes "\"I love Tulimshar's stuff.  I'm collecting souvenirs from Tulimshar to help remind me of all the great times I had there.  If you give me an interesting item from the area, I'll give you a nice reward.  So, you have a new item?\"";
     goto L_startitem;
 
 L_exotic:
-        mes @npcname$;
-        mes "\"I said that because I love Tulimshar's stuff...I'm collecting souvenirs from Tulimshar to help remind me of all the great times I had there.  If you give me an interesting item maybe I can give you a nice reward. But I don't need a lot, I just need one of each item.\"";
+    mes @npcname$;
+    mes "\"I said that because I love Tulimshar's stuff...I'm collecting souvenirs from Tulimshar to help remind me of all the great times I had there.  If you give me an interesting item maybe I can give you a nice reward. But I don't need a lot, I just need one of each item.\"";
     menu
         "I have some items on me maybe you'll like them ", L_startitem,
         "Don't touch my stuff!", L_Close,
@@ -184,9 +184,10 @@ L_MenuItems:
     if (@menuid[@menu] == 5) goto L_skin_Item;
     if (@menuid[@menu] == 6) goto L_BugLegItem;
 //if Never mind
-        mes @npcname$;
-        mes "\"Ok, goodbye then.\"";
+    mes @npcname$;
+    mes "\"Ok, goodbye then.\"";
     close;
+
 L_DesertHat_Item:
     if(@Q_status & (1<<@BIT_DESERTHAT)) goto L_havealready;
     if (countitem("DesertHat") < 1) goto L_Noitem;
@@ -196,6 +197,7 @@ L_DesertHat_Item:
     set @Q_status, @Q_status | (1<<@BIT_DESERTHAT);
     callsub S_Update_Var;
     close;
+
 L_DesertShirt_Item:
     if(@Q_status & (1<<@BIT_DESERTSHIRT)) goto L_havealready;
     if (countitem("DesertShirt") < 1) goto L_Noitem;
@@ -205,6 +207,7 @@ L_DesertShirt_Item:
     set @Q_status, @Q_status | (1<<@BIT_DESERTSHIRT);
     callsub S_Update_Var;
     close;
+
 L_SerfHat_Item:
     if(@Q_status & (1<<@BIT_SERFHAT)) goto L_havealready;
     if (countitem("SerfHat") < 1) goto L_Noitem;
@@ -214,6 +217,7 @@ L_SerfHat_Item:
     set @Q_status, @Q_status | (1<<@BIT_SERFHAT);
     callsub S_Update_Var;
     close;
+
 L_tongue_Item:
     if(@Q_status & (1<<@BIT_MS_TONGUE)) goto L_havealready;
     if (countitem("MountainSnakeTongue") < 1) goto L_Noitem;
@@ -223,6 +227,7 @@ L_tongue_Item:
     set @Q_status, @Q_status | (1<<@BIT_MS_TONGUE);
     callsub S_Update_Var;
     close;
+
 L_egg_Item:
     if(@Q_status & (1<<@BIT_MS_EGG)) goto L_havealready;
     if (countitem("MountainSnakeEgg") < 1) goto L_Noitem;
@@ -232,6 +237,7 @@ L_egg_Item:
     set @Q_status, @Q_status | (1<<@BIT_MS_EGG);
     callsub S_Update_Var;
     close;
+
 L_skin_Item:
     if(@Q_status & (1<<@BIT_SNAKESKIN)) goto L_havealready;
     if (countitem("SnakeSkin") < 1) goto L_Noitem;
@@ -241,6 +247,7 @@ L_skin_Item:
     set @Q_status, @Q_status | (1<<@BIT_SNAKESKIN);
     callsub S_Update_Var;
     close;
+
 L_BugLegItem:
     if(@Q_status & (1<<@BIT_BUGLEG)) goto L_havealready;
     if (countitem("BugLeg") < 1) goto L_Noitem;
@@ -267,8 +274,6 @@ S_Update_Var:
         | (@Q_status << @Q_SHIFT));
     return;
 
-
-
 //# The following stage is completely cutoff the first.
 //# So there is no linking between the upper and lower part, except for one goto at the very beginning
 //
@@ -346,7 +351,8 @@ L_2_talk2:
     close;
 
 L_2_talk3:
-    menu        "Ok, I am a professional in doing such things", L_2_professional,
+    menu
+        "Ok, I am a professional in doing such things", L_2_professional,
         "Hey do you really mean it? ", L_2_professional,
         "You calmed down again?", L_Close,
         "Oh a packrat! By the way, is that trash over there yours?", L_2_name,
@@ -379,8 +385,9 @@ L_2_name:
     mes @npcname$;
     mes "\"What is your name again?\"";
 
-    menu    "I am sorry for the joke... Please forgive me", L_Next,
-            "They call me Mistakes. I am a professional killer as well. You heard about that business in the terranite cave?", L_Next;
+    menu
+        "I am sorry for the joke... Please forgive me", L_Next,
+        "They call me Mistakes. I am a professional killer as well. You heard about that business in the terranite cave?", L_Next;
 
 L_Next:
     mes @npcname$;
@@ -396,4 +403,3 @@ S_Update_Var2:
         | (@Q_status2_bits << @Q_SHIFT2_BITS));
     return;
 }
-
diff --git a/world/map/npc/020-2/furquest.txt b/world/map/npc/020-2/furquest.txt
index 17cb3283..9d694716 100644
--- a/world/map/npc/020-2/furquest.txt
+++ b/world/map/npc/020-2/furquest.txt
@@ -572,7 +572,6 @@ L_Next11:
     set Zeny, Zeny - @FINEDRESS_GP;
     getitem "FineDress", 1;
     set QUEST_WG_state, 23;
-
     close;
 
 L_State_17_NoMoney:
@@ -595,5 +594,4 @@ L_State_18:
 
 L_Close:
     close;
-
 }
diff --git a/world/map/npc/021-1/hetchel.txt b/world/map/npc/021-1/hetchel.txt
index 5023c06d..ab44b747 100644
--- a/world/map/npc/021-1/hetchel.txt
+++ b/world/map/npc/021-1/hetchel.txt
@@ -125,8 +125,6 @@ L_Next2:
 //    mes "to cast a spell on it, so that it will fit to you as soon as you wear it.";
 //    mes "However his prices are not that low.\"";
 //    next;
-//
-//L_robe_menu:
 //    goto L_main_menu;
 
 L_zero_sheet:
diff --git a/world/map/npc/021-1/hideandseek.txt b/world/map/npc/021-1/hideandseek.txt
index 0896f727..9ca48bc2 100644
--- a/world/map/npc/021-1/hideandseek.txt
+++ b/world/map/npc/021-1/hideandseek.txt
@@ -122,6 +122,7 @@ L_Next1:
     mes "\"My friend Vincent thinks so too. He doesn't want to join us playing. Do you know what he does instead?";
     mes "He builds action figures out of Bug Legs! That is lame.\"";
     goto L_Close;
+
 L_Agree:
     mes "[Latif]";
     mes "\"Yeah, right? My friend Vincent doesn't thinks so. He doesn't want to join us playing. Do you know what he does instead?";
diff --git a/world/map/npc/021-2/government_building.txt b/world/map/npc/021-2/government_building.txt
index 7b39a821..e0a8796b 100644
--- a/world/map/npc/021-2/government_building.txt
+++ b/world/map/npc/021-2/government_building.txt
@@ -61,10 +61,9 @@ L_get_rings:
     if (Zeny < WEDDING_FEE)
         menu
             "Thanks anyways. I don't have enough with me.", L_Close;
-    //else
-        menu
-            "I'll buy a pair.", L_get_rings_pay,
-            "Thanks anyways.", L_Close;
+    menu
+        "I'll buy a pair.", L_get_rings_pay,
+        "Thanks anyways.", L_Close;
 
 L_get_rings_pay:
     callsub S_give_rings;
diff --git a/world/map/npc/021-2/kylian.txt b/world/map/npc/021-2/kylian.txt
index 4e26b6dd..49d2d78b 100644
--- a/world/map/npc/021-2/kylian.txt
+++ b/world/map/npc/021-2/kylian.txt
@@ -103,6 +103,7 @@ L_Next:
         "I'm a great adventurer! I don't do errands.",L_Close,
         "No, I'm busy.",L_Close,
         "Mh, ok.",L_Luggage;
+
 L_Luggage:
     mes "[Kylian]";
     mes "\"I need someone to get my luggage from the docks. Show this paper to the sailor who's watching the luggage.\"";
diff --git a/world/map/npc/024-1/eomie.txt b/world/map/npc/024-1/eomie.txt
index 1f62cdb1..5889e6b5 100644
--- a/world/map/npc/024-1/eomie.txt
+++ b/world/map/npc/024-1/eomie.txt
@@ -63,7 +63,8 @@ L_Continue:
     callsub S_Update_Mask;
     goto L_GetStuff;
 
-L_GetStuff: // @state == 8
+L_GetStuff:
+    // @state == 8
     mes "[Eomie]";
     mes "\"I could try to interrupt my spells to be able to cast the spell on the fertilizer, but then I need to prepare the grass for this.";
     mes "Bring me " + @grass_amount + " Grass Seeds, " + @water_amount + " Bottles of Water and " + @ice_amount + " Ice Cubes.\"";
@@ -75,6 +76,7 @@ L_GetStuff: // @state == 8
 L_More:
     if ((countitem("GrassSeed") < @grass_amount) || (countitem("BottleOfWater") < @water_amount) || (countitem("IceCube") < @ice_amount))
         goto L_NoItem;
+
     delitem "GrassSeed", @grass_amount;
     delitem "BottleOfWater", @water_amount;
     delitem "IceCube", @ice_amount;
diff --git a/world/map/npc/024-1/tinris.txt b/world/map/npc/024-1/tinris.txt
index 857ca64c..34352a74 100644
--- a/world/map/npc/024-1/tinris.txt
+++ b/world/map/npc/024-1/tinris.txt
@@ -83,7 +83,8 @@ L_FreshFrom:
     next;
     goto L_FirstTry;
 
-L_FirstTry: // @state == 3
+L_FirstTry:
+    // @state == 3
     mes "[Tinris]";
     mes "\"You need to bring me some ingredients.";
     mes "The ingredients are " + @slime_amount1 + " Maggot Slimes, " + @bugleg_amount1 + " Bug Legs, " + @stinger_amount1 + " Scorpion Stingers and " + @ash_amount1 + " Piles of Ash.\"";
@@ -122,7 +123,8 @@ L_More:
     callsub S_Update_Mask;
     goto L_SecondTry;
 
-L_SecondTry: // @state == 6
+L_SecondTry:
+    // @state == 6
     mes "[Tinris]";
     mes "\"Oh no! All right, we need to do another try.";
     mes "Bring me " + @slime_amount2 + " Maggot Slimes, " + @bugleg_amount2 + " Bug Legs, " + @stinger_amount2 + " Scorpion Stingers, " + @ash_amount2 + " Piles of Ash and " + @cactusp_amount + " Cactus Potion.\"";
@@ -153,17 +155,20 @@ L_HereItIs:
     mes "He gives you the bottle with the magic fertilizer.";
     goto L_Close;
 
-L_Eomie: // @state >= 7 but below 9
+L_Eomie:
+    // @state >= 7 but below 9
     mes "[Tinris]";
     mes "\"I did the best I could, but it seems I'm not experienced enough to cast the spells correctly. Better ask Professor Eomie for help.\"";
     goto L_Close;
 
-L_FertilizerDone: // @state == 9
+L_FertilizerDone:
+    // @state == 9
     mes "[Tinris]";
     mes "\"I heard Eomie cast the spell? I really hope it'll work this time. Bring the magic fertilizer to Anwar now.\"";
     goto L_Close;
 
-L_GiveGift: // @state == 11
+L_GiveGift:
+    // @state == 11
     mes "[Tinris]";
     mes "\"Ah, did Anwar try the new fertilizer?\"";
     menu
@@ -181,7 +186,8 @@ L_ItWorksGreat:
     mes "\"Hey, that's really nice. Tell him my thanks.\"";
     goto L_Close;
 
-L_Done: // @state >= 12
+L_Done:
+    // @state >= 12
     mes "[Tinris]";
     mes "\"My girlfriend was delighted with the Chocolate Cake and Professor Eomie was happy with my work on the magic fertilizer.\"";
     mes "He twinkles.";
diff --git a/world/map/npc/025-1/barrier.txt b/world/map/npc/025-1/barrier.txt
index a4a0565b..f06ca610 100644
--- a/world/map/npc/025-1/barrier.txt
+++ b/world/map/npc/025-1/barrier.txt
@@ -9,10 +9,9 @@
 
 L_Warp:
     warp "025-3.gat", 112, 97;
-end;
+    end;
 
 L_Block:
     message strcharinfo(0), "You are too frightened by what you can hear coming out of the cave that you can't enter.";
-end;
-
+    end;
 }
diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt
index f0332f95..e9a58afa 100644
--- a/world/map/npc/025-1/rossy.txt
+++ b/world/map/npc/025-1/rossy.txt
@@ -78,12 +78,12 @@ L_No:
 L_Mother:
     mes "[Rossy]";
     mes "\"Please, tell my mother we are fine. If you feel like helping, come back after you talk to my mother. Maybe you could help us find some fruits.\"";
-close;
+    close;
 
 L_Get_Cherry:
     mes "[Young Girl]";
     mes "\"No, you don't have " + @Cherry_Amount + " cherries. I know how to count. I hope you get them soon.\"";
-close;
+    close;
 
 L_Check:
     mes "[Rossy]";
@@ -172,14 +172,14 @@ L_Check2:
     mes "\"My teacher's name is David. He is a very young magician and lives near the magic school in the north of Tulimshar.\"";
     next;
     mes "\"Please, give it to him as soon as you can!\"";
-close;
+    close;
 
 L_BT:
     mes "[Rossy]";
     mes "\"Great. Now if you could just give it to my teacher. His name is David. He is a very young magician and lives near the magic school in the north of Tulimshar.\"";
     next;
     mes "\"You should take the ferry, that'll be faster than swimming!\"";
-close;
+    close;
 
 L_Donet:
     if (Rossy_Quest == 10
@@ -191,7 +191,7 @@ L_Donet:
 L_DavidPotion:
     mes "[Rossy]";
     mes "\"Yay! Phew... That was close, I almost forgot about my exam. Please, tell my mother about it. I am sure she will be proud of me.\"";
-close;
+    close;
 
 L_RG:
     if (countitem("RedRose") < @RedRose_Amount)
@@ -212,14 +212,14 @@ L_MotherFlowers:
 L_LikeRoses:
     mes "[Rossy]";
     mes "\"I am allergic to roses, my mother should already know that!\"";
-close;
+    close;
 
 L_Allergic:
     mes "Rossy sneezes a lot.";
     if (Rossy_Quest == 12
         && countitem("RedTulip") >= @RedTulip_Amount)
             goto L_Sorry;
-close;
+    close;
 
 L_Sorry:
     menu
@@ -235,7 +235,7 @@ L_See:
     next;
     mes "\"Now I should really find my sister. Come back later.\"";
     getexp @Flower_EXP, 0;
-close;
+    close;
 
 L_Best:
     mes "[Rossy]";
@@ -247,12 +247,12 @@ L_Best:
 L_FindMySister:
     mes "\"I think I have an idea where she might be. Come back in a few minutes, I will tell you if she is ok.\"";
     set Rossy_Quest, 14;
-close;
+    close;
 
 L_Julia:
     mes "[Rossy]";
     mes "\"I saw Julia! She was running away from something and entered a cave not far from here. I heard her scream. Please can you enter the cave and save her? I'm so scared!\"";
-close;
+    close;
 
 L_End:
     mes "[Rossy]";
@@ -274,19 +274,17 @@ L_Found:
     set Zeny, Zeny + @Finish_Money;
     if (Rossy_Quest == 19)
         goto L_Clear;
-close;
+    close;
 
 L_Clear:
     set Rossy_Quest, 0;
     set cavefights, 0;
     set FLAGS, FLAGS | FLAG_ROSSI_COMPLETED;
-close;
-
+    close;
 
 L_FinalEnd:
     mes "[Rossy]";
     mes "\"Julia and I are playing hide and seek right now. It is fun in the forest!\"";
     mes "The young girl laughs quietly.";
-close;
-
+    close;
 }
diff --git a/world/map/npc/029-3/barrier.txt b/world/map/npc/029-3/barrier.txt
index c8fa5e7f..454e59fe 100644
--- a/world/map/npc/029-3/barrier.txt
+++ b/world/map/npc/029-3/barrier.txt
@@ -4,7 +4,7 @@
     warp "029-1.gat", 54, 39;
     end;
 
-    L_Block:
+L_Block:
     message strcharinfo(0), "Some force seems to be blocking you from exiting.";
     end;
 }
diff --git a/world/map/npc/032-1/miriam.txt b/world/map/npc/032-1/miriam.txt
index 78cd09a9..531c9d56 100644
--- a/world/map/npc/032-1/miriam.txt
+++ b/world/map/npc/032-1/miriam.txt
@@ -294,10 +294,9 @@ L_wasting:
 L_checktime:
     if (QUEST_MIRIAM_cheat != 0)
         goto L_warning;
-    if (QUEST_MIRIAM_run > 210)
-        goto L_tryagain;
-    //else
+    if (QUEST_MIRIAM_run <= 210)
         goto L_goodjob;
+    goto L_tryagain;
 
 L_tryagain:
     mes "[Miriam]";
diff --git a/world/map/npc/033-1/birrod.txt b/world/map/npc/033-1/birrod.txt
index de0eecdd..2437101a 100644
--- a/world/map/npc/033-1/birrod.txt
+++ b/world/map/npc/033-1/birrod.txt
@@ -98,16 +98,19 @@ L_Next:
         "Strength!",L_Fail11,
         "A good weapon.",L_Fail12,
         "Bravery.",L_Success11;
+
 L_Fail11:
     mes "[Birrod]";
     mes "\"Strength is indeed important for a warrior. But before you can show strength, you need to have something else.\"";
     next;
     goto L_No_Member;
+
 L_Fail12:
     mes "[Birrod]";
     mes "\"Are you kidding?\"";
     next;
     goto L_No_Member;
+
 L_Success11:
     mes "[Birrod]";
     mes "\"Wise words.\"";
@@ -117,16 +120,19 @@ L_Success11:
         "Run as fast as I can.",L_Fail21,
         "Fight no matter what.",L_Fail22,
         "Try to hold them back until everyone is safe, then retreat.",L_Success21;
+
 L_Fail21:
     mes "[Birrod]";
     mes "\"You will never become an accepted member of our tribe with that attitude.\"";
     next;
     goto L_No_Member;
+
 L_Fail22:
     mes "[Birrod]";
     mes "\"Honorable, but stupid.\"";
     next;
     goto L_No_Member;
+
 L_Success21:
     mes "[Birrod]";
     mes "\"Right.\"";
@@ -136,63 +142,75 @@ L_Success21:
         "Take care of everyone who got wounded.",L_Success31,
         "Pitch the tent and make a fire.",L_Success32,
         "Lay down and rest.",L_Fail31;
+
 L_Success31:
     mes "[Birrod]";
     mes "\"You're a caring person. Good.\"";
     next;
     goto L_Success3;
+
 L_Success32:
     mes "[Birrod]";
     mes "\"You're diligent, good.\"";
     next;
     goto L_Success3;
+
 L_Fail31:
     mes "[Birrod]";
     mes "\"You wouldn't make friends that way.\"";
     next;
     goto L_No_Member;
+
 L_Success3:
     mes "\"What is your goal in life?\"";
     menu
         "Learn new things and see the world.",L_Success41,
         "Become as powerful as I can.",L_Fail41,
         "Protect the ones I love.",L_Success42;
+
 L_Success41:
     mes "[Birrod]";
     mes "\"You're curious. An attribute we appreciate.\"";
     next;
     goto L_Success4;
+
 L_Fail41:
     mes "[Birrod]";
     mes "\"You're seeking power? For what?\"";
     next;
     goto L_No_Member;
+
 L_Success42:
     mes "[Birrod]";
     mes "\"An honorable goal.\"";
     next;
     goto L_Success4;
+
 L_Success4:
     mes "\"What do you think is a good reason to fight and kill?\"";
     menu
         "Because I want it.",L_Fail51,
         "To survive.",L_Success51,
         "To protect someone in need.",L_Success52;
+
 L_Fail51:
     mes "[Birrod]";
     mes "\"You think so?\"";
     next;
     goto L_No_Member;
+
 L_Success51:
     mes "[Birrod]";
     mes "\"Right.\"";
     next;
     goto L_Success5;
+
 L_Success52:
     mes "[Birrod]";
     mes "\"Yes, that's the most honorable reason.\"";
     next;
     goto L_Success5;
+
 L_Success5:
     getexp @minigame_exp, 0;
     setskill SKILL_RAGING, 1;
diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt
index 183d3651..26993614 100644
--- a/world/map/npc/033-1/kimarr.txt
+++ b/world/map/npc/033-1/kimarr.txt
@@ -69,9 +69,9 @@ L_Continue:
     next;
     set @state, 1;
     callsub S_Update_Mask;
-    goto L_Explain_Game;
+    goto L_ExplainGame;
 
-L_Explain_Game:
+L_ExplainGame:
     mes "[Kimarr]";
     mes "\"In that cave there are living Fluffies. They like to eat apples.\"";
     next;
@@ -93,7 +93,7 @@ L_Ask:
     mes "\"So, are you going to try?\"";
     menu
         "Yeah, let's start!",L_Game,
-        "Could you explain again?",L_Explain_Game,
+        "Could you explain again?",L_ExplainGame,
         "Can you tell me who were the most successful Fluffy hunters?",L_ShowRecord,
         "Maybe later.",L_Close;
 
diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index c54a504c..673ab696 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/world/map/npc/042-2/tanisha.txt
@@ -51,9 +51,9 @@ L_Continue:
     // but that's not a BIG problem
     if (getareausers("042-2.gat", 30, 85, 36, 89) >= $@Maggot_MaxHunters)
         goto L_Crowded;
-    goto L_Fight_Again;
+    goto L_FightAgain;
 
-L_Fight_Again:
+L_FightAgain:
     mes "\"Ok, listen what to do.";
     mes "Equip a weapon and kill the maggots.\"";
     next;
@@ -67,7 +67,7 @@ L_Fight_Again:
     mes "\"Sometimes dead monsters leave some useful things. You can pick them up by pressing Z or clicking on the items with your mouse.\"";
     close2;
     // The getitem must be in the same place as set tanisha, 2;
-    // since it was moved to after L_Fight_Again, add it conditionally
+    // since it was moved to after L_FightAgain, add it conditionally
     if (tanisha == 1)
         goto L_GetFightItems;
     goto L_ContinueFight;
@@ -251,7 +251,7 @@ L_Fail:
 L_TryAgain:
     if (getareausers("042-2.gat", 30, 85, 36, 89) >= $@Maggot_MaxHunters)
         goto L_Crowded;
-    goto L_Fight_Again;
+    goto L_FightAgain;
 
 L_Fighting:
     message strcharinfo(0), "Tanisha: I believe in you!";
diff --git a/world/map/npc/048-2/visitors.txt b/world/map/npc/048-2/visitors.txt
index b4f69e0d..8f43c941 100644
--- a/world/map/npc/048-2/visitors.txt
+++ b/world/map/npc/048-2/visitors.txt
@@ -11,9 +11,6 @@
     next;
     mes "\"I was so excited to get an opportunity to study some of the rare and valuable books and now this.";
     mes "I'd never have expected something like this happening in a Sages household. I thought they're so powerful and wise...\"";
-    goto L_Close;
-
-L_Close:
     close;
 }
 
diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt
index 05d9a1f1..d51f57ac 100644
--- a/world/map/npc/annuals/xmas/debug.txt
+++ b/world/map/npc/annuals/xmas/debug.txt
@@ -201,16 +201,16 @@ L_End:
 
 030-3.gat,26,26,0|script|XmasDebug#3|105,
 {
-   callfunc "XmasDebug";
-   goto L_End;
+    callfunc "XmasDebug";
+    goto L_End;
 
 OnInit:
-   if(!(debug))
-       disablenpc "XmasDebug#3";
+    if(!(debug))
+        disablenpc "XmasDebug#3";
     goto L_End;
 
 L_End:
-   end;
+    end;
 }
 
 030-4.gat,30,30,0|script|XmasDebug#4|111,
@@ -230,24 +230,24 @@ L_End:
 
 botcheck.gat,26,28,0|script|XmasDebug#5|105,
 {
-   if(getgmlevel() < 40)
-       goto L_End;
+    if(getgmlevel() < 40)
+        goto L_End;
 
-   callfunc "XmasDebug";
+    callfunc "XmasDebug";
     goto L_End;
 
 L_End:
-   end;
+    end;
 }
 
 020-1.gat,86,76,0|script|XmasDebug#6|105,
 {
-   callfunc "XmasDebug";
+    callfunc "XmasDebug";
     goto L_End;
 
 OnInit:
-   if(!(debug))
-       disablenpc "XmasDebug#6";
+    if(!(debug))
+        disablenpc "XmasDebug#6";
     goto L_End;
 
 L_End:
diff --git a/world/map/npc/botcheck/announcements.txt b/world/map/npc/botcheck/announcements.txt
index c5ec0b6b..cb7a5f8f 100644
--- a/world/map/npc/botcheck/announcements.txt
+++ b/world/map/npc/botcheck/announcements.txt
@@ -15,13 +15,12 @@
 
 botcheck.gat,49,29,0|script|Stone Board|348,
 {
-if (getgmlevel() < 60)
-    goto L_Close;
+    if (getgmlevel() < 60)
+        goto L_Close;
 
-if ($@GMSA_STATUS == 0)
+    if ($@GMSA_STATUS)
+        goto L_InfoBroadcast;
     goto L_PrepareBroadcast;
-//else
-    goto L_InfoBroadcast;
 
 L_InfoBroadcast:
     set @next_broadcast_ts, (3600000*($@GMSA_TICK - $@GMSA_CURRENT_TICK) - getnpctimer(0))/1000;