diff -u -F regexp -N src/stk/act.informative.c src/act.informative.c
--- src/stk/act.informative.c	Wed Oct 29 00:16:22 1997
+++ src/act.informative.c	Wed Dec 24 07:05:58 1997
@@ -957,7 +957,7 @@
       default:
 	send_to_char(WHO_FORMAT, ch);
 	return;
-	break;
+	
       }				/* end of switch */
 
     } else {			/* endif */
@@ -1104,7 +1104,7 @@
       default:
 	send_to_char(USERS_FORMAT, ch);
 	return;
-	break;
+	
       }				/* end of switch */
 
     } else {			/* endif */
@@ -1246,7 +1246,7 @@
     break;
   default:
     return;
-    break;
+    
   }
 }
 
diff -u -F regexp -N src/stk/act.item.c src/act.item.c
--- src/stk/act.item.c	Wed Oct 29 00:16:22 1997
+++ src/act.item.c	Wed Dec 24 07:01:14 1997
@@ -382,17 +382,17 @@
   case SCMD_DROP:
     obj_to_room(obj, ch->in_room);
     return 0;
-    break;
+   
   case SCMD_DONATE:
     obj_to_room(obj, RDR);
     act("$p suddenly appears in a puff a smoke!", FALSE, 0, obj, 0, TO_ROOM);
     return 0;
-    break;
+    
   case SCMD_JUNK:
     value = MAX(1, MIN(200, GET_OBJ_COST(obj) >> 4));
     extract_obj(obj);
     return value;
-    break;
+    
   default:
     log("SYSERR: Incorrect argument passed to perform_drop");
     break;
diff -u -F regexp -N src/stk/act.other.c src/act.other.c
--- src/stk/act.other.c	Wed Oct 29 00:16:22 1997
+++ src/act.other.c	Wed Dec 24 07:14:42 1997
@@ -601,11 +601,11 @@
       sprintf(buf2, "You don't seem to be holding %s %s.\r\n", AN(arg), arg);
       send_to_char(buf2, ch);
       return;
-      break;
+      
     default:
       log("SYSERR: Unknown subcmd passed to do_use");
       return;
-      break;
+      
     }
   }
   switch (subcmd) {
@@ -711,7 +711,7 @@
       default:
 	send_to_char("Usage: prompt { { H | M | V } | all | none }\r\n", ch);
 	return;
-	break;
+	
       }
     }
   }
@@ -883,7 +883,7 @@
   default:
     log("SYSERR: Unknown subcmd in do_gen_toggle");
     return;
-    break;
+    
   }
 
   if (result)
diff -u -F regexp -N src/stk/act.wizard.c src/act.wizard.c
--- src/stk/act.wizard.c	Wed Oct 29 00:16:22 1997
+++ src/act.wizard.c	Wed Dec 24 07:20:06 1997
@@ -1395,7 +1395,7 @@
   switch (subcmd) {
   case SCMD_POOFIN:    msg = &(POOFIN(ch));    break;
   case SCMD_POOFOUT:   msg = &(POOFOUT(ch));   break;
-  default:    return;    break;
+  default:    return;    
   }
 
   skip_spaces(&argument);
@@ -1660,7 +1660,7 @@
     }
     send_to_char(buf1, ch);
     return;
-    break;
+    
   case '\\':
     ++argument;
     break;
@@ -2429,7 +2429,7 @@
   default:
     send_to_char("Can't set that!\r\n", ch);
     return 0;
-    break;
+   
   }
 
   strcat(output, "\r\n");
diff -u -F regexp -N src/stk/class.c src/class.c
--- src/stk/class.c	Wed Oct 29 00:16:22 1997
+++ src/class.c	Wed Dec 24 07:34:34 1997
@@ -70,19 +70,19 @@
   switch (arg) {
   case 'm':
     return CLASS_MAGIC_USER;
-    break;
+    
   case 'c':
     return CLASS_CLERIC;
-    break;
+   
   case 'w':
     return CLASS_WARRIOR;
-    break;
+   
   case 't':
     return CLASS_THIEF;
-    break;
+    
   default:
     return CLASS_UNDEFINED;
-    break;
+    
   }
 }
 
@@ -100,19 +100,19 @@
   switch (arg) {
     case 'm':
       return (1 << 0);
-      break;
+      
     case 'c':
       return (1 << 1);
-      break;
+      
     case 't':
       return (1 << 2);
-      break;
+      
     case 'w':
       return (1 << 3);
-      break;
+      
     default:
       return 0;
-      break;
+      
   }
 }
 
@@ -548,153 +548,153 @@
 
     case CLASS_MAGIC_USER:
     switch (level) {
-      case  0: return 0;	break;
-      case  1: return 1;	break;
-      case  2: return 2500;	break;
-      case  3: return 5000;	break;
-      case  4: return 10000;	break;
-      case  5: return 20000;	break;
-      case  6: return 40000;	break;
-      case  7: return 60000;	break;
-      case  8: return 90000;	break;
-      case  9: return 135000;	break;
-      case 10: return 250000;	break;
-      case 11: return 375000;	break;
-      case 12: return 750000;	break;
-      case 13: return 1125000;	break;
-      case 14: return 1500000;	break;
-      case 15: return 1875000;	break;
-      case 16: return 2250000;	break;
-      case 17: return 2625000;	break;
-      case 18: return 3000000;	break;
-      case 19: return 3375000;	break;
-      case 20: return 3750000;	break;
-      case 21: return 4000000;	break;
-      case 22: return 4300000;	break;
-      case 23: return 4600000;	break;
-      case 24: return 4900000;	break;
-      case 25: return 5200000;	break;
-      case 26: return 5500000;	break;
-      case 27: return 5950000;	break;
-      case 28: return 6400000;	break;
-      case 29: return 6850000;	break;
-      case 30: return 7400000;	break;
+      case  0: return 0;	
+      case  1: return 1;	
+      case  2: return 2500;	
+      case  3: return 5000;	
+      case  4: return 10000;	
+      case  5: return 20000;	
+      case  6: return 40000;	
+      case  7: return 60000;	
+      case  8: return 90000;	
+      case  9: return 135000;	
+      case 10: return 250000;	
+      case 11: return 375000;	
+      case 12: return 750000;	
+      case 13: return 1125000;	
+      case 14: return 1500000;	
+      case 15: return 1875000;	
+      case 16: return 2250000;	
+      case 17: return 2625000;	
+      case 18: return 3000000;	
+      case 19: return 3375000;	
+      case 20: return 3750000;	
+      case 21: return 4000000;	
+      case 22: return 4300000;	
+      case 23: return 4600000;	
+      case 24: return 4900000;	
+      case 25: return 5200000;	
+      case 26: return 5500000;	
+      case 27: return 5950000;
+      case 28: return 6400000;	
+      case 29: return 6850000;	
+      case 30: return 7400000;	
       /* add new levels here */
-      case LVL_IMMORT: return 8000000;	break;
+      case LVL_IMMORT: return 8000000;	
     }
     break;
 
     case CLASS_CLERIC:
     switch (level) {
-      case  0: return 0;	break;
-      case  1: return 1;	break;
-      case  2: return 1500;	break;
-      case  3: return 3000;	break;
-      case  4: return 6000;	break;
-      case  5: return 13000;	break;
-      case  6: return 27500;	break;
-      case  7: return 55000;	break;
-      case  8: return 110000;	break;
-      case  9: return 225000;	break;
-      case 10: return 450000;	break;
-      case 11: return 675000;	break;
-      case 12: return 900000;	break;
-      case 13: return 1125000;	break;
-      case 14: return 1350000;	break;
-      case 15: return 1575000;	break;
-      case 16: return 1800000;	break;
-      case 17: return 2100000;	break;
-      case 18: return 2400000;	break;
-      case 19: return 2700000;	break;
-      case 20: return 3000000;	break;
-      case 21: return 3250000;	break;
-      case 22: return 3500000;	break;
-      case 23: return 3800000;	break;
-      case 24: return 4100000;	break;
-      case 25: return 4400000;	break;
-      case 26: return 4800000;	break;
-      case 27: return 5200000;	break;
-      case 28: return 5600000;	break;
-      case 29: return 6000000;	break;
-      case 30: return 6400000;	break;
+      case  0: return 0;
+      case  1: return 1;	
+      case  2: return 1500;	
+      case  3: return 3000;	
+      case  4: return 6000;	
+      case  5: return 13000;	
+      case  6: return 27500;	
+      case  7: return 55000;	
+      case  8: return 110000;	
+      case  9: return 225000;	
+      case 10: return 450000;
+      case 11: return 675000;	
+      case 12: return 900000;	
+      case 13: return 1125000;	
+      case 14: return 1350000;	
+      case 15: return 1575000;	
+      case 16: return 1800000;	
+      case 17: return 2100000;	
+      case 18: return 2400000;	
+      case 19: return 2700000;	
+      case 20: return 3000000;	
+      case 21: return 3250000;	
+      case 22: return 3500000;	
+      case 23: return 3800000;	
+      case 24: return 4100000;	
+      case 25: return 4400000;	
+      case 26: return 4800000;	
+      case 27: return 5200000;	
+      case 28: return 5600000;	
+      case 29: return 6000000;	
+      case 30: return 6400000;	
       /* add new levels here */
-      case LVL_IMMORT: return 7000000;	break;
+      case LVL_IMMORT: return 7000000;	
     }
     break;
 
     case CLASS_THIEF:
     switch (level) {
-      case  0: return 0;	break;
-      case  1: return 1;	break;
-      case  2: return 1250;	break;
-      case  3: return 2500;	break;
-      case  4: return 5000;	break;
-      case  5: return 10000;	break;
-      case  6: return 20000;	break;
-      case  7: return 30000;	break;
-      case  8: return 70000;	break;
-      case  9: return 110000;	break;
-      case 10: return 160000;	break;
-      case 11: return 220000;	break;
-      case 12: return 440000;	break;
-      case 13: return 660000;	break;
-      case 14: return 880000;	break;
-      case 15: return 1100000;	break;
-      case 16: return 1500000;	break;
-      case 17: return 2000000;	break;
-      case 18: return 2500000;	break;
-      case 19: return 3000000;	break;
-      case 20: return 3500000;	break;
-      case 21: return 3650000;	break;
-      case 22: return 3800000;	break;
-      case 23: return 4100000;	break;
-      case 24: return 4400000;	break;
-      case 25: return 4700000;	break;
-      case 26: return 5100000;	break;
-      case 27: return 5500000;	break;
-      case 28: return 5900000;	break;
-      case 29: return 6300000;	break;
-      case 30: return 6650000;	break;
+      case  0: return 0;	 
+      case  1: return 1;	 
+      case  2: return 1250;	 
+      case  3: return 2500;	 
+      case  4: return 5000;	 
+      case  5: return 10000;	 
+      case  6: return 20000;	 
+      case  7: return 30000;	 
+      case  8: return 70000;	 
+      case  9: return 110000;	 
+      case 10: return 160000;	 
+      case 11: return 220000;	 
+      case 12: return 440000;	 
+      case 13: return 660000;	 
+      case 14: return 880000;	 
+      case 15: return 1100000;	 
+      case 16: return 1500000;	 
+      case 17: return 2000000;	 
+      case 18: return 2500000;	 
+      case 19: return 3000000;	 
+      case 20: return 3500000;	 
+      case 21: return 3650000;	 
+      case 22: return 3800000;	 
+      case 23: return 4100000;	 
+      case 24: return 4400000;	 
+      case 25: return 4700000;	 
+      case 26: return 5100000;	 
+      case 27: return 5500000;	 
+      case 28: return 5900000;	 
+      case 29: return 6300000;	 
+      case 30: return 6650000;	 
       /* add new levels here */
-      case LVL_IMMORT: return 7000000;	break;
+      case LVL_IMMORT: return 7000000;	 
     }
     break;
 
     case CLASS_WARRIOR:
     switch (level) {
-      case  0: return 0;	break;
-      case  1: return 1;	break;
-      case  2: return 2000;	break;
-      case  3: return 4000;	break;
-      case  4: return 8000;	break;
-      case  5: return 16000;	break;
-      case  6: return 32000;	break;
-      case  7: return 64000;	break;
-      case  8: return 125000;	break;
-      case  9: return 250000;	break;
-      case 10: return 500000;	break;
-      case 11: return 750000;	break;
-      case 12: return 1000000;	break;
-      case 13: return 1250000;	break;
-      case 14: return 1500000;	break;
-      case 15: return 1850000;	break;
-      case 16: return 2200000;	break;
-      case 17: return 2550000;	break;
-      case 18: return 2900000;	break;
-      case 19: return 3250000;	break;
-      case 20: return 3600000;	break;
-      case 21: return 3900000;	break;
-      case 22: return 4200000;	break;
-      case 23: return 4500000;	break;
-      case 24: return 4800000;	break;
-      case 25: return 5150000;	break;
-      case 26: return 5500000;	break;
-      case 27: return 5950000;	break;
-      case 28: return 6400000;	break;
-      case 29: return 6850000;	break;
-      case 30: return 7400000;	break;
+      case  0: return 0;	 
+      case  1: return 1;	 
+      case  2: return 2000;	 
+      case  3: return 4000;	 
+      case  4: return 8000;	 
+      case  5: return 16000;	 
+      case  6: return 32000;	 
+      case  7: return 64000;	 
+      case  8: return 125000;	 
+      case  9: return 250000;	 
+      case 10: return 500000;	 
+      case 11: return 750000;	 
+      case 12: return 1000000;	 
+      case 13: return 1250000;	 
+      case 14: return 1500000;	 
+      case 15: return 1850000;	 
+      case 16: return 2200000;	 
+      case 17: return 2550000;	 
+      case 18: return 2900000;	 
+      case 19: return 3250000;	 
+      case 20: return 3600000;	 
+      case 21: return 3900000;	 
+      case 22: return 4200000;	 
+      case 23: return 4500000;	 
+      case 24: return 4800000;	 
+      case 25: return 5150000;	 
+      case 26: return 5500000;	 
+      case 27: return 5950000;	 
+      case 28: return 6400000;	 
+      case 29: return 6850000;	 
+      case 30: return 7400000;	 
       /* add new levels here */
-      case LVL_IMMORT: return 8000000;	break;
+      case LVL_IMMORT: return 8000000;	 
     }
     break;
   }
@@ -723,130 +723,130 @@
 
     case CLASS_MAGIC_USER:
     switch (level) {
-      case  1: return "the Apprentice of Magic"; break;
-      case  2: return "the Spell Student"; break;
-      case  3: return "the Scholar of Magic"; break;
-      case  4: return "the Delver in Spells"; break;
-      case  5: return "the Medium of Magic"; break;
-      case  6: return "the Scribe of Magic"; break;
-      case  7: return "the Seer"; break;
-      case  8: return "the Sage"; break;
-      case  9: return "the Illusionist"; break;
-      case 10: return "the Abjurer"; break;
-      case 11: return "the Invoker"; break;
-      case 12: return "the Enchanter"; break;
-      case 13: return "the Conjurer"; break;
-      case 14: return "the Magician"; break;
-      case 15: return "the Creator"; break;
-      case 16: return "the Savant"; break;
-      case 17: return "the Magus"; break;
-      case 18: return "the Wizard"; break;
-      case 19: return "the Warlock"; break;
-      case 20: return "the Sorcerer"; break;
-      case 21: return "the Necromancer"; break;
-      case 22: return "the Thaumaturge"; break;
-      case 23: return "the Student of the Occult"; break;
-      case 24: return "the Disciple of the Uncanny"; break;
-      case 25: return "the Minor Elemental"; break;
-      case 26: return "the Greater Elemental"; break;
-      case 27: return "the Crafter of Magics"; break;
-      case 28: return "the Shaman"; break;
-      case 29: return "the Keeper of Talismans"; break;
-      case 30: return "the Archmage"; break;
-      case LVL_IMMORT: return "the Immortal Warlock"; break;
-      case LVL_GOD: return "the Avatar of Magic"; break;
-      case LVL_GRGOD: return "the God of Magic"; break;
-      default: return "the Mage"; break;
+      case  1: return "the Apprentice of Magic";  
+      case  2: return "the Spell Student";  
+      case  3: return "the Scholar of Magic";  
+      case  4: return "the Delver in Spells";  
+      case  5: return "the Medium of Magic";  
+      case  6: return "the Scribe of Magic";  
+      case  7: return "the Seer";  
+      case  8: return "the Sage";  
+      case  9: return "the Illusionist";  
+      case 10: return "the Abjurer";  
+      case 11: return "the Invoker";  
+      case 12: return "the Enchanter";  
+      case 13: return "the Conjurer";  
+      case 14: return "the Magician";  
+      case 15: return "the Creator";  
+      case 16: return "the Savant";  
+      case 17: return "the Magus";  
+      case 18: return "the Wizard";  
+      case 19: return "the Warlock";  
+      case 20: return "the Sorcerer";  
+      case 21: return "the Necromancer";  
+      case 22: return "the Thaumaturge";  
+      case 23: return "the Student of the Occult";  
+      case 24: return "the Disciple of the Uncanny";  
+      case 25: return "the Minor Elemental";  
+      case 26: return "the Greater Elemental";  
+      case 27: return "the Crafter of Magics";  
+      case 28: return "the Shaman";  
+      case 29: return "the Keeper of Talismans";  
+      case 30: return "the Archmage";  
+      case LVL_IMMORT: return "the Immortal Warlock";  
+      case LVL_GOD: return "the Avatar of Magic";  
+      case LVL_GRGOD: return "the God of Magic";  
+      default: return "the Mage";  
     }
     break;
 
     case CLASS_CLERIC:
     switch (level) {
-      case  1: return "the Believer"; break;
-      case  2: return "the Attendant"; break;
-      case  3: return "the Acolyte"; break;
-      case  4: return "the Novice"; break;
-      case  5: return "the Missionary"; break;
-      case  6: return "the Adept"; break;
-      case  7: return "the Deacon"; break;
-      case  8: return "the Vicar"; break;
-      case  9: return "the Priest"; break;
-      case 10: return "the Minister"; break;
-      case 11: return "the Canon"; break;
-      case 12: return "the Levite"; break;
-      case 13: return "the Curate"; break;
-      case 14: return "the Monk"; break;
-      case 15: return "the Healer"; break;
-      case 16: return "the Chaplain"; break;
-      case 17: return "the Expositor"; break;
-      case 18: return "the Bishop"; break;
-      case 19: return "the Arch Bishop"; break;
-      case 20: return "the Patriarch"; break;
+      case  1: return "the Believer";  
+      case  2: return "the Attendant";  
+      case  3: return "the Acolyte";  
+      case  4: return "the Novice";  
+      case  5: return "the Missionary";  
+      case  6: return "the Adept";  
+      case  7: return "the Deacon";  
+      case  8: return "the Vicar";  
+      case  9: return "the Priest";  
+      case 10: return "the Minister";  
+      case 11: return "the Canon";  
+      case 12: return "the Levite";  
+      case 13: return "the Curate";  
+      case 14: return "the Monk";  
+      case 15: return "the Healer";  
+      case 16: return "the Chaplain";  
+      case 17: return "the Expositor";  
+      case 18: return "the Bishop";  
+      case 19: return "the Arch Bishop";  
+      case 20: return "the Patriarch";  
       /* no one ever thought up these titles 21-30 */
-      case LVL_IMMORT: return "the Immortal Cardinal"; break;
-      case LVL_GOD: return "the Inquisitor"; break;
-      case LVL_GRGOD: return "the God of good and evil"; break;
-      default: return "the Cleric"; break;
+      case LVL_IMMORT: return "the Immortal Cardinal";  
+      case LVL_GOD: return "the Inquisitor";  
+      case LVL_GRGOD: return "the God of good and evil";  
+      default: return "the Cleric";  
     }
     break;
 
     case CLASS_THIEF:
     switch (level) {
-      case  1: return "the Pilferer"; break;
-      case  2: return "the Footpad"; break;
-      case  3: return "the Filcher"; break;
-      case  4: return "the Pick-Pocket"; break;
-      case  5: return "the Sneak"; break;
-      case  6: return "the Pincher"; break;
-      case  7: return "the Cut-Purse"; break;
-      case  8: return "the Snatcher"; break;
-      case  9: return "the Sharper"; break;
-      case 10: return "the Rogue"; break;
-      case 11: return "the Robber"; break;
-      case 12: return "the Magsman"; break;
-      case 13: return "the Highwayman"; break;
-      case 14: return "the Burglar"; break;
-      case 15: return "the Thief"; break;
-      case 16: return "the Knifer"; break;
-      case 17: return "the Quick-Blade"; break;
-      case 18: return "the Killer"; break;
-      case 19: return "the Brigand"; break;
-      case 20: return "the Cut-Throat"; break;
+      case  1: return "the Pilferer";  
+      case  2: return "the Footpad";  
+      case  3: return "the Filcher";  
+      case  4: return "the Pick-Pocket";  
+      case  5: return "the Sneak";  
+      case  6: return "the Pincher";  
+      case  7: return "the Cut-Purse";  
+      case  8: return "the Snatcher";  
+      case  9: return "the Sharper";  
+      case 10: return "the Rogue";  
+      case 11: return "the Robber";  
+      case 12: return "the Magsman";  
+      case 13: return "the Highwayman";  
+      case 14: return "the Burglar";  
+      case 15: return "the Thief";  
+      case 16: return "the Knifer";  
+      case 17: return "the Quick-Blade";  
+      case 18: return "the Killer";  
+      case 19: return "the Brigand";  
+      case 20: return "the Cut-Throat";  
       /* no one ever thought up these titles 21-30 */
-      case LVL_IMMORT: return "the Immortal Assasin"; break;
-      case LVL_GOD: return "the Demi God of thieves"; break;
-      case LVL_GRGOD: return "the God of thieves and tradesmen"; break;
-      default: return "the Thief"; break;
+      case LVL_IMMORT: return "the Immortal Assasin";  
+      case LVL_GOD: return "the Demi God of thieves";  
+      case LVL_GRGOD: return "the God of thieves and tradesmen";  
+      default: return "the Thief";  
     }
     break;
 
     case CLASS_WARRIOR:
     switch(level) {
-      case  1: return "the Swordpupil"; break;
-      case  2: return "the Recruit"; break;
-      case  3: return "the Sentry"; break;
-      case  4: return "the Fighter"; break;
-      case  5: return "the Soldier"; break;
-      case  6: return "the Warrior"; break;
-      case  7: return "the Veteran"; break;
-      case  8: return "the Swordsman"; break;
-      case  9: return "the Fencer"; break;
-      case 10: return "the Combatant"; break;
-      case 11: return "the Hero"; break;
-      case 12: return "the Myrmidon"; break;
-      case 13: return "the Swashbuckler"; break;
-      case 14: return "the Mercenary"; break;
-      case 15: return "the Swordmaster"; break;
-      case 16: return "the Lieutenant"; break;
-      case 17: return "the Champion"; break;
-      case 18: return "the Dragoon"; break;
-      case 19: return "the Cavalier"; break;
-      case 20: return "the Knight"; break;
+      case  1: return "the Swordpupil";  
+      case  2: return "the Recruit";  
+      case  3: return "the Sentry";  
+      case  4: return "the Fighter";  
+      case  5: return "the Soldier";  
+      case  6: return "the Warrior";  
+      case  7: return "the Veteran";  
+      case  8: return "the Swordsman";  
+      case  9: return "the Fencer";  
+      case 10: return "the Combatant";  
+      case 11: return "the Hero";  
+      case 12: return "the Myrmidon";  
+      case 13: return "the Swashbuckler";  
+      case 14: return "the Mercenary";  
+      case 15: return "the Swordmaster";  
+      case 16: return "the Lieutenant";  
+      case 17: return "the Champion";  
+      case 18: return "the Dragoon";  
+      case 19: return "the Cavalier";  
+      case 20: return "the Knight";  
       /* no one ever thought up these titles 21-30 */
-      case LVL_IMMORT: return "the Immortal Warlord"; break;
-      case LVL_GOD: return "the Extirpator"; break;
-      case LVL_GRGOD: return "the God of war"; break;
-      default: return "the Warrior"; break;
+      case LVL_IMMORT: return "the Immortal Warlord";  
+      case LVL_GOD: return "the Extirpator";  
+      case LVL_GRGOD: return "the God of war";  
+      default: return "the Warrior";  
     }
     break;
   }
@@ -870,131 +870,131 @@
 
     case CLASS_MAGIC_USER:
     switch (level) {
-      case  1: return "the Apprentice of Magic"; break;
-      case  2: return "the Spell Student"; break;
-      case  3: return "the Scholar of Magic"; break;
-      case  4: return "the Delveress in Spells"; break;
-      case  5: return "the Medium of Magic"; break;
-      case  6: return "the Scribess of Magic"; break;
-      case  7: return "the Seeress"; break;
-      case  8: return "the Sage"; break;
-      case  9: return "the Illusionist"; break;
-      case 10: return "the Abjuress"; break;
-      case 11: return "the Invoker"; break;
-      case 12: return "the Enchantress"; break;
-      case 13: return "the Conjuress"; break;
-      case 14: return "the Witch"; break;
-      case 15: return "the Creator"; break;
-      case 16: return "the Savant"; break;
-      case 17: return "the Craftess"; break;
-      case 18: return "the Wizard"; break;
-      case 19: return "the War Witch"; break;
-      case 20: return "the Sorceress"; break;
-      case 21: return "the Necromancress"; break;
-      case 22: return "the Thaumaturgess"; break;
-      case 23: return "the Student of the Occult"; break;
-      case 24: return "the Disciple of the Uncanny"; break;
-      case 25: return "the Minor Elementress"; break;
-      case 26: return "the Greater Elementress"; break;
-      case 27: return "the Crafter of Magics"; break;
-      case 28: return "Shaman"; break;
-      case 29: return "the Keeper of Talismans"; break;
-      case 30: return "Archwitch"; break;
-      case LVL_IMMORT: return "the Immortal Enchantress"; break;
-      case LVL_GOD: return "the Empress of Magic"; break;
-      case LVL_GRGOD: return "the Goddess of Magic"; break;
-      default: return "the Witch"; break;
+      case  1: return "the Apprentice of Magic";  
+      case  2: return "the Spell Student";  
+      case  3: return "the Scholar of Magic";  
+      case  4: return "the Delveress in Spells";  
+      case  5: return "the Medium of Magic";  
+      case  6: return "the Scribess of Magic";  
+      case  7: return "the Seeress";  
+      case  8: return "the Sage";  
+      case  9: return "the Illusionist";  
+      case 10: return "the Abjuress";  
+      case 11: return "the Invoker";  
+      case 12: return "the Enchantress";  
+      case 13: return "the Conjuress";  
+      case 14: return "the Witch";  
+      case 15: return "the Creator";  
+      case 16: return "the Savant";  
+      case 17: return "the Craftess";  
+      case 18: return "the Wizard";  
+      case 19: return "the War Witch";  
+      case 20: return "the Sorceress";  
+      case 21: return "the Necromancress";  
+      case 22: return "the Thaumaturgess";  
+      case 23: return "the Student of the Occult";  
+      case 24: return "the Disciple of the Uncanny";  
+      case 25: return "the Minor Elementress";  
+      case 26: return "the Greater Elementress";  
+      case 27: return "the Crafter of Magics";  
+      case 28: return "Shaman";  
+      case 29: return "the Keeper of Talismans";  
+      case 30: return "Archwitch";  
+      case LVL_IMMORT: return "the Immortal Enchantress";  
+      case LVL_GOD: return "the Empress of Magic";  
+      case LVL_GRGOD: return "the Goddess of Magic";  
+      default: return "the Witch";  
     }
     break;
 
     case CLASS_CLERIC:
     switch (level) {
-      case  1: return "the Believer"; break;
-      case  2: return "the Attendant"; break;
-      case  3: return "the Acolyte"; break;
-      case  4: return "the Novice"; break;
-      case  5: return "the Missionary"; break;
-      case  6: return "the Adept"; break;
-      case  7: return "the Deaconess"; break;
-      case  8: return "the Vicaress"; break;
-      case  9: return "the Priestess"; break;
-      case 10: return "the Lady Minister"; break;
-      case 11: return "the Canon"; break;
-      case 12: return "the Levitess"; break;
-      case 13: return "the Curess"; break;
-      case 14: return "the Nunne"; break;
-      case 15: return "the Healess"; break;
-      case 16: return "the Chaplain"; break;
-      case 17: return "the Expositress"; break;
-      case 18: return "the Bishop"; break;
-      case 19: return "the Arch Lady of the Church"; break;
-      case 20: return "the Matriarch"; break;
+      case  1: return "the Believer";  
+      case  2: return "the Attendant";  
+      case  3: return "the Acolyte";  
+      case  4: return "the Novice";  
+      case  5: return "the Missionary";  
+      case  6: return "the Adept";  
+      case  7: return "the Deaconess";  
+      case  8: return "the Vicaress";  
+      case  9: return "the Priestess";  
+      case 10: return "the Lady Minister";  
+      case 11: return "the Canon";  
+      case 12: return "the Levitess";  
+      case 13: return "the Curess";  
+      case 14: return "the Nunne";  
+      case 15: return "the Healess";  
+      case 16: return "the Chaplain";  
+      case 17: return "the Expositress";  
+      case 18: return "the Bishop";  
+      case 19: return "the Arch Lady of the Church";  
+      case 20: return "the Matriarch";  
       /* no one ever thought up these titles 21-30 */
-      case LVL_IMMORT: return "the Immortal Priestess"; break;
-      case LVL_GOD: return "the Inquisitress"; break;
-      case LVL_GRGOD: return "the Goddess of good and evil"; break;
-      default: return "the Cleric"; break;
+      case LVL_IMMORT: return "the Immortal Priestess";  
+      case LVL_GOD: return "the Inquisitress";  
+      case LVL_GRGOD: return "the Goddess of good and evil";  
+      default: return "the Cleric";  
     }
     break;
 
     case CLASS_THIEF:
     switch (level) {
-      case  1: return "the Pilferess"; break;
-      case  2: return "the Footpad"; break;
-      case  3: return "the Filcheress"; break;
-      case  4: return "the Pick-Pocket"; break;
-      case  5: return "the Sneak"; break;
-      case  6: return "the Pincheress"; break;
-      case  7: return "the Cut-Purse"; break;
-      case  8: return "the Snatcheress"; break;
-      case  9: return "the Sharpress"; break;
-      case 10: return "the Rogue"; break;
-      case 11: return "the Robber"; break;
-      case 12: return "the Magswoman"; break;
-      case 13: return "the Highwaywoman"; break;
-      case 14: return "the Burglaress"; break;
-      case 15: return "the Thief"; break;
-      case 16: return "the Knifer"; break;
-      case 17: return "the Quick-Blade"; break;
-      case 18: return "the Murderess"; break;
-      case 19: return "the Brigand"; break;
-      case 20: return "the Cut-Throat"; break;
-      case 34: return "the Implementress"; break;
+      case  1: return "the Pilferess";  
+      case  2: return "the Footpad";  
+      case  3: return "the Filcheress";  
+      case  4: return "the Pick-Pocket";  
+      case  5: return "the Sneak";  
+      case  6: return "the Pincheress";  
+      case  7: return "the Cut-Purse";  
+      case  8: return "the Snatcheress";  
+      case  9: return "the Sharpress";  
+      case 10: return "the Rogue";  
+      case 11: return "the Robber";  
+      case 12: return "the Magswoman";  
+      case 13: return "the Highwaywoman";  
+      case 14: return "the Burglaress";  
+      case 15: return "the Thief";  
+      case 16: return "the Knifer";  
+      case 17: return "the Quick-Blade";  
+      case 18: return "the Murderess";  
+      case 19: return "the Brigand";  
+      case 20: return "the Cut-Throat";  
+      case 34: return "the Implementress";  
       /* no one ever thought up these titles 21-30 */
-      case LVL_IMMORT: return "the Immortal Assasin"; break;
-      case LVL_GOD: return "the Demi Goddess of thieves"; break;
-      case LVL_GRGOD: return "the Goddess of thieves and tradesmen"; break;
-      default: return "the Thief"; break;
+      case LVL_IMMORT: return "the Immortal Assasin";  
+      case LVL_GOD: return "the Demi Goddess of thieves";  
+      case LVL_GRGOD: return "the Goddess of thieves and tradesmen";  
+      default: return "the Thief";  
     }
     break;
 
     case CLASS_WARRIOR:
     switch(level) {
-      case  1: return "the Swordpupil"; break;
-      case  2: return "the Recruit"; break;
-      case  3: return "the Sentress"; break;
-      case  4: return "the Fighter"; break;
-      case  5: return "the Soldier"; break;
-      case  6: return "the Warrior"; break;
-      case  7: return "the Veteran"; break;
-      case  8: return "the Swordswoman"; break;
-      case  9: return "the Fenceress"; break;
-      case 10: return "the Combatess"; break;
-      case 11: return "the Heroine"; break;
-      case 12: return "the Myrmidon"; break;
-      case 13: return "the Swashbuckleress"; break;
-      case 14: return "the Mercenaress"; break;
-      case 15: return "the Swordmistress"; break;
-      case 16: return "the Lieutenant"; break;
-      case 17: return "the Lady Champion"; break;
-      case 18: return "the Lady Dragoon"; break;
-      case 19: return "the Cavalier"; break;
-      case 20: return "the Lady Knight"; break;
+      case  1: return "the Swordpupil";  
+      case  2: return "the Recruit";  
+      case  3: return "the Sentress";  
+      case  4: return "the Fighter";  
+      case  5: return "the Soldier";  
+      case  6: return "the Warrior";  
+      case  7: return "the Veteran";  
+      case  8: return "the Swordswoman";  
+      case  9: return "the Fenceress";  
+      case 10: return "the Combatess";  
+      case 11: return "the Heroine";  
+      case 12: return "the Myrmidon";  
+      case 13: return "the Swashbuckleress";  
+      case 14: return "the Mercenaress";  
+      case 15: return "the Swordmistress";  
+      case 16: return "the Lieutenant";  
+      case 17: return "the Lady Champion";  
+      case 18: return "the Lady Dragoon";  
+      case 19: return "the Cavalier";  
+      case 20: return "the Lady Knight";  
       /* no one ever thought up these titles 21-30 */
-      case LVL_IMMORT: return "the Immortal Lady of War"; break;
-      case LVL_GOD: return "the Queen of Destruction"; break;
-      case LVL_GRGOD: return "the Goddess of war"; break;
-      default: return "the Warrior"; break;
+      case LVL_IMMORT: return "the Immortal Lady of War";  
+      case LVL_GOD: return "the Queen of Destruction";  
+      case LVL_GRGOD: return "the Goddess of war";  
+      default: return "the Warrior";  
     }
     break;
   }
diff -u -F regexp -N src/stk/db.c src/db.c
--- src/stk/db.c	Wed Oct 29 00:16:24 1997
+++ src/db.c	Wed Dec 24 07:37:50 1997
@@ -705,7 +705,7 @@
     case 'S':			/* end of room */
       top_of_world = room_nr++;
       return;
-      break;
+      
     default:
       fprintf(stderr, "%s\n", buf);
       exit(1);
@@ -1190,7 +1190,7 @@
     case '#':
       top_of_objt = i++;
       return line;
-      break;
+      
     default:
       fprintf(stderr, "SYSERR: Format error in %s\n", buf2);
       exit(1);
diff -u -F regexp -N src/stk/house.c src/house.c
--- src/stk/house.c	Wed Oct 29 00:16:26 1997
+++ src/house.c	Wed Dec 24 07:42:44 1997
@@ -590,7 +590,7 @@
       if (GET_IDNUM(ch) == house_control[i].guests[j])
 	return 1;
     return 0;
-    break;
+   
   }
 
   return 0;
diff -u -F regexp -N src/stk/interpreter.c src/interpreter.c
--- src/stk/interpreter.c	Wed Oct 29 00:16:28 1997
+++ src/interpreter.c	Wed Dec 24 07:40:26 1997
@@ -1502,7 +1502,7 @@
       SEND_TO_Q("That is not a sex..\r\n"
 		"What IS your sex? ", d);
       return;
-      break;
+      
     }
 
     SEND_TO_Q(class_menu, d);
diff -u -F regexp -N src/stk/magic.c src/magic.c
--- src/stk/magic.c	Wed Oct 29 00:16:28 1997
+++ src/magic.c	Wed Dec 24 07:45:28 1997
@@ -976,7 +976,7 @@
     sprintf(buf, "SYSERR: unknown spellnum %d passed to mag_unaffects", spellnum);
     log(buf);
     return;
-    break;
+    
   }
 
   if (!affected_by_spell(victim, spell)) {
@@ -1080,7 +1080,7 @@
   default:
     send_to_char("Spell unimplemented, it would seem.\r\n", ch);
     return;
-    break;
+    
   }
 
   if (!(tobj = read_object(z, VIRTUAL))) {
diff -u -F regexp -N src/stk/olc.c src/olc.c
--- src/stk/olc.c	Wed Oct 29 17:04:08 1997
+++ src/olc.c	Wed Dec 24 07:48:52 1997
@@ -92,7 +92,7 @@
   case OLC_SHOW:
     olc_set_show(ch, olc_mode, argument);
     return;
-    break;
+
   case OLC_REPEAT:
     if (!(olc_mode = GET_LAST_OLC_MODE(ch)) ||
 	((olc_targ = GET_LAST_OLC_TARG(ch)) == NULL)) {
@@ -154,7 +154,7 @@
   default:
     send_to_char("Usage: olc {.|set|show|obj|mob|room} [args]\r\n", ch);
     return;
-    break;
+    
   }
 
   if (olc_targ == NULL)
@@ -201,7 +201,7 @@
   default:
     log("SYSERR: Invalid OLC mode passed to interp.");
     return;
-    break;
+    
   }
 
 
Common subdirectories: src/stk/stk and src/stk
Common subdirectories: src/stk/util and src/util
diff -u -F regexp -N src/stk/utils.c src/utils.c
--- src/stk/utils.c	Wed Oct 29 00:16:30 1997
+++ src/utils.c	Wed Dec 24 07:51:40 1997
@@ -425,7 +425,7 @@
     break;
   default:
     return 0;
-    break;
+   
   }
 
   if (!*orig_name)