Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision 9a8930f5bb61faf0b3acd02c38d9af3f76c294a6)
+++ src/CodeGen/CodeGenerator.cc	(revision bb86117bbd7e779383ad78c9eeeb43bcacaf6c3f)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  4 14:05:45 2015
-// Update Count     : 120
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Jun 04 15:00:00 2015
+// Update Count     : 125
 //
 
@@ -483,5 +483,4 @@
 
 	void CodeGenerator::visit( SwitchStmt *switchStmt ) {
-		//output << /* "\r" << */ string( cur_indent, ' ' ) << CodeGenerator::printLabels( switchStmt->get_labels() ) 
 		output << "switch (" ;
 		switchStmt->get_condition()->accept(*this );
@@ -500,7 +499,7 @@
 	void CodeGenerator::visit( CaseStmt *caseStmt ) {
 		output << string( cur_indent, ' ' );
-		if ( caseStmt->isDefault()) 
+		if ( caseStmt->isDefault()) {
 			output << "default";
-		else {
+		} else {
 			output << "case ";
 			caseStmt->get_condition()->accept(*this );
@@ -512,5 +511,5 @@
 		cur_indent += CodeGenerator::tabsize;
 		for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
-			output << /* "\r" << */ string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() )  ;
+			output << string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() )  ;
 			(*i)->accept(*this );
 			output << endl;
@@ -520,7 +519,4 @@
 
 	void CodeGenerator::visit( BranchStmt *branchStmt ) {
-		output << "\r" << string( cur_indent, ' ' );
-		output << CodeGenerator::printLabels( branchStmt->get_labels());
-
 		switch ( branchStmt->get_type()) {
 		  case BranchStmt::Goto:
@@ -568,5 +564,5 @@
 		whileStmt->get_body()->accept( *this );
 
-		output << /* "\r" << */ string( cur_indent, ' ' );
+		output << string( cur_indent, ' ' );
 
 		if ( whileStmt->get_isDoWhile() ) {
@@ -600,5 +596,5 @@
 
 	void CodeGenerator::visit( NullStmt *nullStmt ) {
-		//output << /* "\r" << */ string( cur_indent, ' ' ) << CodeGenerator::printLabels( nullStmt->get_labels() );
+		//output << string( cur_indent, ' ' ) << CodeGenerator::printLabels( nullStmt->get_labels() );
 		output << "/* null statement */ ;";
 	}