--- a/mm7_4.cpp	Fri Oct 26 02:38:26 2012 +0200
+++ b/mm7_4.cpp	Fri Oct 26 02:42:38 2012 +0200
@@ -5336,63 +5336,41 @@
   int v51; // eax@49
   char *v52; // edi@52
   char v53; // al@52
-  int v54; // edi@53
+  int uClassType; // edi@53
   int v55; // ST0C_4@53
   int v56; // eax@53
   int v57; // eax@53
-  const char *v58; // ST10_4@55
-  unsigned int v59; // ST0C_4@55
   int v60; // eax@55
   int v61; // ecx@55
-  const char *v62; // ST10_4@57
-  unsigned int v63; // ST0C_4@57
   int v64; // ST08_4@57
   int v65; // eax@57
   int v66; // ecx@57
-  const char *v67; // ST10_4@59
-  unsigned int v68; // ST0C_4@59
   int v69; // ST08_4@59
   int v70; // eax@59
   int v71; // eax@59
-  const char *v72; // ST10_4@61
-  unsigned int v73; // ST0C_4@61
   int v74; // eax@61
   int v75; // eax@61
-  const char *v76; // ST10_4@63
-  unsigned int v77; // ST0C_4@63
   int v78; // ST08_4@63
   int v79; // eax@63
   int v80; // eax@63
-  const char *v81; // ST10_4@65
-  unsigned int v82; // ST0C_4@65
   int v83; // ST08_4@65
   int v84; // eax@65
   int v85; // eax@65
-  const char *v86; // ST10_4@67
-  unsigned int v87; // ST0C_4@67
   int v88; // eax@67
   int v89; // eax@67
-  const char *v90; // ST10_4@69
-  unsigned int v91; // ST0C_4@69
   int v92; // ST08_4@69
   int v93; // eax@69
   int v94; // eax@69
-  const char *v95; // ST10_4@71
-  unsigned int v96; // ST0C_4@71
   int v97; // ST08_4@71
   int v98; // eax@71
-  const char *v99; // ST10_4@71
-  int v100; // ST0C_4@71
   int v101; // eax@71
   enum PLAYER_SKILL_TYPE v102; // edi@72
   size_t v103; // eax@72
   signed int v104; // ecx@72
   int v105; // ecx@79
-  int v106; // edi@81
   unsigned int v107; // ST0C_4@81
   int pTextY; // ST08_4@81
   int v109; // eax@81
-  const char *v110; // ST10_4@82
   int v111; // ST0C_4@82
   int v112; // eax@82
   signed int v113; // edi@82
@@ -5664,86 +5642,65 @@
       v51 = v134;
     }
   }
-  v54 = pParty->pPlayers[uPlayerCreationUI_SelectedCharacter].uClass;
+  uClassType = pParty->pPlayers[uPlayerCreationUI_SelectedCharacter].uClass;
   v55 = uColor1;
-  v133 = pParty->pPlayers[uPlayerCreationUI_SelectedCharacter].uClass;
   v56 = pFontCreate->AlignText_Center(193u, Str1);
   pGUIWindow_CurrentMenu->DrawText(pFontCreate, v56 + 324, 395, v55, Str1, 0, 0, 0);
   v57 = uColorTeal;
-  if ( v54 )
+  if ( uClassType )
     v57 = uColorWhite;
-  v58 = pClassNames[0];
-  v59 = v57;
   v60 = pFontCreate->AlignText_Center(65u, pClassNames[0]);
-  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v60 + 323, 417, v59, v58, 0, 0, 0);
+  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v60 + 323, 417, v57, pClassNames[0], 0, 0, 0);
   v61 = uColorTeal;
-  if ( v133 != 12 )
+  if ( uClassType != PLAYER_CLASS_PALADIN )
     v61 = uColorWhite;
-  v62 = pClassNames[12];
-  v63 = v61;
   v64 = v128 + 417;
   uColorGreen = v128 + 417;
   v65 = pFontCreate->AlignText_Center(65u, pClassNames[12]);
-  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v65 + 323, v64, v63, v62, 0, 0, 0);
+  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v65 + 323, v64, v61, pClassNames[12], 0, 0, 0);
   v66 = uColorTeal;
-  if ( v133 != 20 )
+  if ( uClassType != PLAYER_CLASS_DRUID )
     v66 = uColorWhite;
-  v67 = pClassNames[20];
-  v68 = v66;
   v69 = 2 * v128 + 417;
   v126 = 2 * v128 + 417;
   v70 = pFontCreate->AlignText_Center(65u, pClassNames[20]);
-  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v70 + 323, v69, v68, v67, 0, 0, 0);
+  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v70 + 323, v69, v66, pClassNames[20], 0, 0, 0);
   v71 = uColorTeal;
-  if ( v133 != PLAYER_CLASS_CLERIC )
+  if ( uClassType != PLAYER_CLASS_CLERIC )
     v71 = uColorWhite;
-  v72 = pClassNames[24];
-  v73 = v71;
   v74 = pFontCreate->AlignText_Center(65u, pClassNames[24]);
-  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v74 + 388, 417, v73, v72, 0, 0, 0);
+  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v74 + 388, 417, v71, pClassNames[24], 0, 0, 0);
   v75 = uColorTeal;
-  if ( v133 != 28 )
+  if ( uClassType != 28 )
     v75 = uColorWhite;
-  v76 = pClassNames[28];
-  v77 = v75;
   v78 = uColorGreen;
   v79 = pFontCreate->AlignText_Center(65u, pClassNames[28]);
-  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v79 + 388, v78, v77, v76, 0, 0, 0);
+  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v79 + 388, v78, v75, pClassNames[28], 0, 0, 0);
   v80 = uColorTeal;
-  if ( v133 != PLAYER_CLASS_SORCERER )
+  if ( uClassType != PLAYER_CLASS_SORCERER )
     v80 = uColorWhite;
-  v81 = pClassNames[32];
-  v82 = v80;
   v83 = v126;
   v84 = pFontCreate->AlignText_Center(65u, pClassNames[32]);
-  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v84 + 388, v83, v82, v81, 0, 0, 0);
+  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v84 + 388, v83, v80, pClassNames[32], 0, 0, 0);
   v85 = uColorTeal;
-  if ( v133 != 16 )
+  if ( uClassType != PLAYER_CLASS_SHOOTER )
     v85 = uColorWhite;
-  v86 = pClassNames[16];
-  v87 = v85;
   v88 = pFontCreate->AlignText_Center(65u, pClassNames[16]);
-  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v88 + 453, 417, v87, v86, 0, 0, 0);
+  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v88 + 453, 417, v85, pClassNames[16], 0, 0, 0);
   v89 = uColorTeal;
-  if ( v133 != 8 )
+  if ( uClassType != PLAYER_CLASS_MONK )
     v89 = uColorWhite;
-  v90 = pClassNames[8];
-  v91 = v89;
   v92 = uColorGreen;
   v93 = pFontCreate->AlignText_Center(65u, pClassNames[8]);
-  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v93 + 453, v92, v91, v90, 0, 0, 0);
+  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v93 + 453, v92, v89, pClassNames[8], 0, 0, 0);
   v94 = uColorTeal;
-  if ( v133 != 4 )
+  if ( uClassType != PLAYER_CLASS_THEIF )
     v94 = uColorWhite;
-  v95 = pClassNames[4];
-  v96 = v94;
   v97 = v126;
   v98 = pFontCreate->AlignText_Center(65u, pClassNames[4]);
-  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v98 + 453, v97, v96, v95, 0, 0, 0);
-  v99 = pGlobalTXT_LocalizationStrings[20];     // "Available Skills"
-  v100 = uColor1;
-  v101 = pFontCreate->AlignText_Center(0xECu, pGlobalTXT_LocalizationStrings[20]);
-  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v101 + 37, 395, v100, v99, 0, 0, 0);
+  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v98 + 453, v97, v94, pClassNames[4], 0, 0, 0);
+  v101 = pFontCreate->AlignText_Center(0xECu, pGlobalTXT_LocalizationStrings[20]); // "Available Skills"
+  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v101 + 37, 395, uColor1, pGlobalTXT_LocalizationStrings[20], 0, 0, 0);
   v134 = 0;
   do
   {
@@ -5773,12 +5730,11 @@
     v105 = uColorTeal;
     if ( !pParty->pPlayers[0].pActiveSkills[v102 + 3486 * uPlayerCreationUI_SelectedCharacter] )
       v105 = uColorWhite;
-    v106 = v134 / 3;
-	v107 = v105;
+    v107 = v105;
 	v109 = pFontCreate->AlignText_Center(100u, Str1);
     pGUIWindow_CurrentMenu->DrawText(
       pFontCreate,
-      100 * v106 + v109 + uColorGreen + 17,
+      100 * (v134 / 3) + v109 + uColorGreen + 17,
       v128 * (v134 % 3) + 417,
       v107,
       Str1,
@@ -5788,10 +5744,9 @@
     ++v134;
   }
   while ( v134 < 9 );
-  v110 = pGlobalTXT_LocalizationStrings[30];    // "Bonus"
   v111 = uColor1;
-  v112 = pFontCreate->AlignText_Center(0x5Cu, pGlobalTXT_LocalizationStrings[30]);
-  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v112 + 533, 394, v111, v110, 0, 0, 0);
+  v112 = pFontCreate->AlignText_Center(0x5Cu, pGlobalTXT_LocalizationStrings[30]);// "Bonus"
+  pGUIWindow_CurrentMenu->DrawText(pFontCreate, v112 + 533, 394, v111, pGlobalTXT_LocalizationStrings[30], 0, 0, 0);
   v113 = PlayerCreation_ComputeAttributeBonus();
   sprintf(pTmpBuf, "%d", v113);
   v114 = uColorWhite;