Index: libcfa/src/parseconfig.cfa
===================================================================
--- libcfa/src/parseconfig.cfa	(revision 1e05e09973cb8e9b9a78ccdc6682f3222f13a7b9)
+++ libcfa/src/parseconfig.cfa	(revision c1dafea06a60295405a29f1b59f8d0999e26afca)
@@ -34,10 +34,4 @@
 	kvp.data = alloc( size );
 }
-/*
-void ?{}( KVPairs & kvp, KVPairs val ) with( val ) { 	// copy, deep
-	kvp.[ size, max_size ] = [ size, max_size ];
-	kvp.data = alloc( size, data );
-}
-*/
 void ^?{}( KVPairs & kvp ) with ( kvp ) {				// destructor
 	free( data );
@@ -73,10 +67,11 @@
 		open( in, config_file );					// open the configuration file for input
 
-		while () {										// parameter names can appear in any order
+		while () {									// parameter names can appear in any order
 			char key[64];
 			char value[256];
 
-		  if ( comments( in, key ) ) break;				// eof ?
-		  	// Must add check to see if we have already read in a key-value pair, once we switch to using hash table as intermediate storage
+		  	// Must add check to see if already read in a key-value pair,
+			// once we switch to using hash table as intermediate storage
+		  if ( comments( in, key ) ) break;			// eof ?
 			in | value;
 
@@ -84,5 +79,5 @@
 
 		  if ( eof( in ) ) break;
-			in | nl;									// ignore remainder of line
+			in | nl;								// ignore remainder of line
 		} // for
 	} catch( Open_Failure * ex; ex->istream == &in ) {