Index: translator/ControlStruct/LabelFixer.cc
===================================================================
--- translator/ControlStruct/LabelFixer.cc	(revision d9a0e763800888addddd70d8848a8f432b825e4b)
+++ translator/ControlStruct/LabelFixer.cc	(revision 6c3744ea42a3b5b7c0caad3216f7a909daf8e9ed)
@@ -24,5 +24,5 @@
     }
 
-    void LabelFixer::visit(FunctionDecl *functionDecl) {
+    void LabelFixer::visit( FunctionDecl *functionDecl ) {
 	if ( functionDecl->get_statements() != 0 )
 	    functionDecl->get_statements()->accept( *this );
@@ -32,5 +32,5 @@
     }
 
-    void LabelFixer::visit(Statement *stmt ) {
+    void LabelFixer::visit( Statement *stmt ) {
 	std::list< Label > &labels = stmt->get_labels();
 
@@ -42,5 +42,5 @@
     }
 
-    void LabelFixer::visit(BranchStmt *branchStmt) {
+    void LabelFixer::visit( BranchStmt *branchStmt ) {
 	visit ( ( Statement * )branchStmt );  // the labels this statement might have
 
@@ -50,5 +50,4 @@
 	} //else       /* computed goto or normal exit-loop statements */
     }
-
 
     Label LabelFixer::setLabelsDef( std::list< Label > &llabel, Statement *definition ) {
@@ -61,6 +60,6 @@
 		{ used = true; labelTable[ *i ] = entry; } // undefined and unused
 	    else
-		if( labelTable[ *i ]->defined() )
-		    throw SemanticError("Duplicate definition of label: " + *i );
+		if ( labelTable[ *i ]->defined() )
+		    throw SemanticError( "Duplicate definition of label: " + *i );
 		else
 		    labelTable[ *i ]->set_definition( definition );
@@ -82,8 +81,8 @@
     }
 
-    std::map < Label, Statement * > *LabelFixer::resolveJumps() throw ( SemanticError ) {
-	std::map < Statement *, Entry * > def_us;
+    std::map<Label, Statement * > *LabelFixer::resolveJumps() throw ( SemanticError ) {
+	std::map< Statement *, Entry * > def_us;
 
-	for ( std::map < Label, Entry *>::iterator i = labelTable.begin(); i != labelTable.end(); i++ ) {
+	for ( std::map< Label, Entry *>::iterator i = labelTable.begin(); i != labelTable.end(); i++ ) {
 	    Entry *e = i->second;
 
@@ -91,12 +90,12 @@
 		def_us[ e->get_definition() ] = e;
 	    else
-		if(e->used())
+		if ( e->used() )
 		    def_us[ e->get_definition() ]->add_uses( e->get_uses() );
 	}
 
 	// get rid of labelTable
-	for ( std::map < Statement *, Entry * >::iterator i = def_us.begin(); i != def_us.end(); i++ ) {
+	for ( std::map< Statement *, Entry * >::iterator i = def_us.begin(); i != def_us.end(); i++ ) {
 	    Statement *to = (*i).first;
-	    std::list < Statement *> &from = (*i).second->get_uses();
+	    std::list< Statement *> &from = (*i).second->get_uses();
 	    Label finalLabel = generator->newLabel();
 	    (*i).second->set_label( finalLabel );
@@ -114,5 +113,5 @@
 
 	    for ( std::list< Statement *>::iterator j = from.begin(); j != from.end(); j++ ) {
-		BranchStmt *jumpTo = dynamic_cast < BranchStmt * > ( *j );
+		BranchStmt *jumpTo = dynamic_cast< BranchStmt * > ( *j );
 		assert( jumpTo != 0 );
 		jumpTo->set_target( finalLabel );
@@ -121,6 +120,6 @@
 
 	// reverse table
-	std::map < Label, Statement * > *ret = new std::map < Label, Statement * >();
-	for (std::map < Statement *, Entry * >::iterator i = def_us.begin(); i != def_us.end(); i++ ) 
+	std::map< Label, Statement * > *ret = new std::map< Label, Statement * >();
+	for ( std::map< Statement *, Entry * >::iterator i = def_us.begin(); i != def_us.end(); i++ ) 
 	    (*ret)[ (*i).second->get_label() ] = (*i).first;
 
Index: translator/ControlStruct/MLEMutator.cc
===================================================================
--- translator/ControlStruct/MLEMutator.cc	(revision d9a0e763800888addddd70d8848a8f432b825e4b)
+++ translator/ControlStruct/MLEMutator.cc	(revision 6c3744ea42a3b5b7c0caad3216f7a909daf8e9ed)
@@ -12,5 +12,5 @@
     }
 
-    CompoundStmt* MLEMutator::mutate(CompoundStmt *cmpndStmt) {
+    CompoundStmt* MLEMutator::mutate( CompoundStmt *cmpndStmt ) {
 	bool labeledBlock = false;
 	if ( !((cmpndStmt->get_labels()).empty()) ) {
@@ -27,5 +27,5 @@
 		if ( next == kids.end() ) {
 		    std::list<Label> ls; ls.push_back( get_breakLabel() );
-		    kids.push_back( new NullStmt(ls) );
+		    kids.push_back( new NullStmt( ls ) );
 		} else
 		    (*next)->get_labels().push_back( get_breakLabel() );
@@ -88,5 +88,5 @@
 	std::list< Entry >::iterator check;
 	if ( ( check = std::find( enclosingLoops.begin(), enclosingLoops.end(), (*targetTable)[branchStmt->get_target()] ) ) == enclosingLoops.end() )
-	    // not in loop, checking if in switch/choose
+	    // not in loop, checking if in block
 	    if ( (check = std::find( enclosingBlocks.begin(), enclosingBlocks.end(), (*targetTable)[branchStmt->get_target()] )) == enclosingBlocks.end() )
 		// neither in loop nor in block, checking if in switch/choose
@@ -95,5 +95,5 @@
 
 	if ( enclosingLoops.back() == (*check) )
-	    return branchStmt;                      // exit the innermost loop (labels not necessary)
+	    return branchStmt;				// exit the innermost loop (labels unnecessary)
 
 	Label newLabel;
@@ -102,21 +102,26 @@
 	    if ( check->get_breakExit() != "" )
 		newLabel = check->get_breakExit();
-	    else { newLabel = generator->newLabel(); check->set_breakExit( newLabel ); }
+	    else {
+		newLabel = generator->newLabel();
+		check->set_breakExit( newLabel );
+	    } // if
 	    break;
 	  case BranchStmt::Continue:
 	    if ( check->get_contExit() != "" )
 		newLabel = check->get_contExit();
-	    else { newLabel = generator->newLabel(); check->set_contExit( newLabel ); }
+	    else {
+		newLabel = generator->newLabel();
+		check->set_contExit( newLabel );
+	    } // if
 	    break;
 	  default:
-	    // shouldn't be here
-	    return 0;
+	    return 0;					// shouldn't be here
 	} // switch
 
-	return new BranchStmt(std::list<Label>(), newLabel, BranchStmt::Goto );
+	return new BranchStmt( std::list<Label>(), newLabel, BranchStmt::Goto );
     }
 
 
-    Statement *MLEMutator::mutate(SwitchStmt *switchStmt) {
+    Statement *MLEMutator::mutate( SwitchStmt *switchStmt ) {
 	Label brkLabel = generator->newLabel();
 	enclosingSwitches.push_back( Entry(switchStmt, "", brkLabel) );
@@ -131,5 +136,5 @@
     }
 
-    Statement *MLEMutator::mutate(ChooseStmt *switchStmt) {
+    Statement *MLEMutator::mutate( ChooseStmt *switchStmt ) {
 	Label brkLabel = generator->newLabel();
 	enclosingSwitches.push_back( Entry(switchStmt,"", brkLabel) );
Index: translator/ControlStruct/MLEMutator.h
===================================================================
--- translator/ControlStruct/MLEMutator.h	(revision d9a0e763800888addddd70d8848a8f432b825e4b)
+++ translator/ControlStruct/MLEMutator.h	(revision 6c3744ea42a3b5b7c0caad3216f7a909daf8e9ed)
@@ -15,5 +15,5 @@
 	class Entry;
       public:
-	MLEMutator( std::map <Label, Statement *> *t, LabelGenerator *gen = 0 ) : targetTable( t ), breakLabel(std::string("")), generator( gen ) {}
+	MLEMutator( std::map<Label, Statement *> *t, LabelGenerator *gen = 0 ) : targetTable( t ), breakLabel(std::string("")), generator( gen ) {}
 	~MLEMutator();
 
@@ -56,6 +56,6 @@
 	};
 
-	std::map <Label, Statement *> *targetTable;
-	std::list < Entry > enclosingBlocks,enclosingLoops,enclosingSwitches;
+	std::map< Label, Statement * > *targetTable;
+	std::list< Entry > enclosingBlocks, enclosingLoops, enclosingSwitches;
 	Label breakLabel;
 	LabelGenerator *generator;