Index: /issm/trunk-jpl/src/c/Container/Nodes.cpp
===================================================================
--- /issm/trunk-jpl/src/c/Container/Nodes.cpp	(revision 13412)
+++ /issm/trunk-jpl/src/c/Container/Nodes.cpp	(revision 13413)
@@ -160,5 +160,4 @@
 	ranks=xNew<int>(numnodes);
 	minranks=xNew<int>(numnodes);
-
 	for(i=0;i<numnodes;i++)ranks[i]=num_procs; //no cpu can have rank num_procs. This is the maximum limit.
 
@@ -171,5 +170,5 @@
 	 * order of cpu rank. This is also why we initialized this array to num_procs.*/
 	#ifdef _HAVE_MPI_
-	MPI_Allreduce ( (void*)ranks,(void*)minranks,numnodes,MPI_INT,MPI_MIN,MPI_COMM_WORLD);
+	MPI_Allreduce((void*)ranks,(void*)minranks,numnodes,MPI_INT,MPI_MIN,MPI_COMM_WORLD);
 	#else
 	for(i=0;i<numnodes;i++)minranks[i]=ranks[i];
@@ -329,25 +328,19 @@
 void   Nodes::Ranks(int* ranks,int analysis_type){
 
+	extern int my_rank;
+	int        sid;
+
 	/*Go through nodes, and for each object, report it cpu: */
-
-	int i;
-	int rank;
-	int sid;
-	
-	for(i=0;i<this->Size();i++){
-
-		Node* node=(Node*)this->GetObjectByOffset(i);
-
-		/*Check that this node corresponds to our analysis currently being carried out: */
-		if (node->InAnalysis(analysis_type)){
-
-			rank=node->MyRank();
+	for(int i=0;i<this->Size();i++){
+
+		Node* node=(Node*)this->GetObjectByOffset(i);
+
+		/*Check that this node corresponds to our analysis currently being carried out: */
+		if (node->InAnalysis(analysis_type)){
+			/*Plug rank into ranks, according to sid: */
 			sid=node->Sid();
-
-			/*Plug rank into ranks, according to id: */
-			ranks[sid]=rank; 
-		}
-	}
-	return;
+			ranks[sid]=my_rank; 
+		}
+	}
 }
 /*}}}*/
Index: /issm/trunk-jpl/src/c/Container/Vertices.cpp
===================================================================
--- /issm/trunk-jpl/src/c/Container/Vertices.cpp	(revision 13412)
+++ /issm/trunk-jpl/src/c/Container/Vertices.cpp	(revision 13413)
@@ -177,19 +177,14 @@
 void   Vertices::Ranks(int* ranks){
 
+	extern int my_rank;
+	int        sid;
+
 	/*Go through a dataset, and for each object, report it cpu: */
-
-	int i;
-	int rank;
-	int sid;
-	
-	for(i=0;i<this->Size();i++){
+	for(int i=0;i<this->Size();i++){
+		/*Plug rank into ranks, according to id: */
 		Vertex* vertex=(Vertex*)this->GetObjectByOffset(i);
-		rank=vertex->MyRank();
 		sid=vertex->Sid();
-		
-		/*Plug rank into ranks, according to id: */
-		ranks[sid]=rank; 
+		ranks[sid]=my_rank; 
 	}
-	return;
 }
 /*}}}*/
Index: /issm/trunk-jpl/src/c/classes/DofIndexing.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/DofIndexing.cpp	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/DofIndexing.cpp	(revision 13413)
@@ -204,3 +204,2 @@
 }		
 /*}}}*/
-
Index: /issm/trunk-jpl/src/c/classes/DofIndexing.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/DofIndexing.h	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/DofIndexing.h	(revision 13413)
@@ -13,24 +13,23 @@
 
 		/*sizes: */
-		int gsize; //number of dofs for a node
-		int fsize; //number of dofs solver for
-		int ssize; //number of constrained dofs
+		int gsize;   //number of dofs for a node
+		int fsize;   //number of dofs solver for
+		int ssize;   //number of constrained dofs
 
 		/*partitioning: */
-		bool clone;   //this node is replicated from another one 
+		bool clone;   //this node is replicated from another one
 
 		/*boundary conditions sets: */
-		bool*     f_set; //is dof on f-set (on which we solve)
-		bool*     s_set; //is dof on s-set (on which boundary conditions -dirichlet- are applied)
-		IssmDouble*   svalues; //list of constraint values. size g_size, for ease of use.
+		bool       *f_set;     //is dof on f-set (on which we solve)
+		bool       *s_set;     //is dof on s-set (on which boundary conditions -dirichlet- are applied)
+		IssmDouble *svalues;   //list of constraint values. size g_size, for ease of use.
 
 		/*types of dofs: */
-		int*     doftype; //approximation type of the dofs (used only for coupling), size g_size
+		int        *doftype;   //approximation type of the dofs (used only for coupling), size g_size
 		
 		/*list of degrees of freedom: */
-		int*     gdoflist; //dof list in g_set
-		int*     fdoflist; //dof list in f_set
-		int*     sdoflist; //dof list in s_set
-
+		int *gdoflist;   //dof list in g_set
+		int *fdoflist;   //dof list in f_set
+		int *sdoflist;   //dof list in s_set
 
 		/*DofIndexing constructors, destructors {{{*/
Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 13413)
@@ -2,5 +2,4 @@
  * \brief: implementation of the FemModel object
  */
-
 
 #ifdef HAVE_CONFIG_H
@@ -33,8 +32,8 @@
 
 	/*Initialize internal data: */
-	this->nummodels=nummodels;
-	this->solution_type=in_solution_type;
-	this->analysis_counter=nummodels-1; //point to last analysis_type carried out.
-	this->results=new Results(); //not initialized by CreateDataSets
+	this->nummodels        = nummodels;
+	this->solution_type    = in_solution_type;
+	this->analysis_counter = nummodels-1;   //point to last analysis_type carried out.
+	this->results          = new Results(); //not initialized by CreateDataSets
 	
 	/*Dynamically allocate whatever is a list of length nummodels: */
@@ -74,7 +73,5 @@
 	/*Add output file name to parameters: */
 	this->parameters->AddObject(new StringParam(OutputfilenameEnum,outputfilename));
-
 }
-
 /*}}}*/
 /*FUNCTION FemModel::destructor {{{*/
@@ -153,6 +150,4 @@
 /*FUNCTION FemModel::SetCurrentConfiguration(int configuration_type){{{*/
 void FemModel::SetCurrentConfiguration(int configuration_type){
-
-	/*overload: analysis_type = configuration_type: */
 	this->SetCurrentConfiguration(configuration_type,configuration_type);
 }
Index: /issm/trunk-jpl/src/c/classes/FemModel.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.h	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/FemModel.h	(revision 13413)
@@ -28,17 +28,17 @@
 	public:
 
-		int                 nummodels;
-		int                 solution_type;
-		int*                analysis_type_list; //list of analyses this femmodel is going to carry out
-		int                 analysis_counter; //counter into analysis_type_list
-		
-		Elements*           elements; //elements (one set for all analyses)
-		Nodes*              nodes; //one set of nodes
-		Vertices*           vertices; //one set of vertices
-		Constraints*        constraints; //one set of constraints. each constraint knows which analysis_type it handles
-		Loads*              loads;  //one set of constraints. each constraint knows which analysis_type it handles
-		Materials*          materials;  //one set of materials, for each element
-		Parameters*         parameters; //one set of parameters, independent of the analysis_type
-		Results*            results; //results that cannot be fit into the elements (such as one time constants, arrays, strings, etc ...)
+		int          nummodels;
+		int          solution_type;
+		int         *analysis_type_list;   //list of analyses this femmodel is going to carry out
+		int          analysis_counter;     //counter into analysis_type_list
+
+		Elements    *elements;             //elements (one set for all analyses)
+		Nodes       *nodes;                //one set of nodes
+		Vertices    *vertices;             //one set of vertices
+		Constraints *constraints;          //one set of constraints. each constraint knows which analysis_type it handles
+		Loads       *loads;                //one set of constraints. each constraint knows which analysis_type it handles
+		Materials   *materials;            //one set of materials, for each element
+		Parameters  *parameters;           //one set of parameters, independent of the analysis_type
+		Results     *results;              //results that cannot be fit into the elements 
 
 		/*constructors, destructors: */
Index: /issm/trunk-jpl/src/c/classes/Hook.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Hook.cpp	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/Hook.cpp	(revision 13413)
@@ -2,5 +2,4 @@
  * \brief: implementation of the Hook object: see Hook.h for more explanations.
  */
-
 
 #ifdef HAVE_CONFIG_H
@@ -18,20 +17,15 @@
 #include "../include/include.h"
 
-
 /*Constructor/Destructors*/
 /*FUNCTION Hook::Hook(){{{*/
 Hook::Hook(){
-	this->num=0;
-	this->objects=NULL;
-	this->ids=NULL;
-	this->offsets=NULL;
-	return;
+	this->num     = 0;
+	this->objects = NULL;
+	this->ids     = NULL;
+	this->offsets = NULL;
 }
 /*}}}*/
 /*FUNCTION Hook::Hook(int* ids, int num){{{*/
 Hook::Hook(int* in_ids, int in_num){
-
-	/*Intermediaries*/
-	int i;
 
 	/*Get number of objects to hook*/
@@ -41,7 +35,7 @@
 	if (num==0){
 		/*Empty hook*/
-		this->ids=NULL;
-		this->objects=NULL;
-		this->offsets=NULL;
+		this->ids     = NULL;
+		this->objects = NULL;
+		this->offsets = NULL;
 	}
 	else{
@@ -52,8 +46,8 @@
 
 		/*Copy ids: */
-		for (i=0;i<this->num;i++){
-			this->ids[i]=in_ids[i];
-			this->objects[i]=NULL;
-			this->offsets[i]=0;
+		for(int i=0;i<this->num;i++){
+			this->ids[i]     = in_ids[i];
+			this->objects[i] = NULL;
+			this->offsets[i] = 0;
 		}
 	}
@@ -62,9 +56,7 @@
 /*FUNCTION Hook::~Hook(){{{*/
 Hook::~Hook(){
-	/*deallocate: */
 	xDelete<Object*>(this->objects);
 	xDelete<int>(this->ids);
 	xDelete<int>(this->offsets);
-	return;
 }
 /*}}}*/
@@ -121,6 +113,4 @@
 Object* Hook::copy(void){
 
-	int i;
-
 	/*output: */
 	Hook* output=NULL;
@@ -132,13 +122,13 @@
 	output->num=this->num;
 	if(output->num){
-		output->objects=xNew<Object*>(output->num);
-		output->ids=xNew<int>(output->num);
-		output->offsets=xNew<int>(output->num);
+		output->objects = xNew<Object*>(output->num);
+		output->ids     = xNew<int>(output->num);
+		output->offsets = xNew<int>(output->num);
 	}
 	
-	for(i=0;i<output->num;i++){
-		output->objects[i]=this->objects[i];
-		output->offsets[i]=this->offsets[i];
-		output->ids[i]=this->ids[i];
+	for(int i=0;i<output->num;i++){
+		output->objects[i] = this->objects[i];
+		output->offsets[i] = this->offsets[i];
+		output->ids[i]     = this->ids[i];
 	}
 
@@ -231,6 +221,4 @@
 Hook* Hook::Spawn(int* indices, int numindices){
 
-	int i;
-
 	/*output: */
 	Hook* output=NULL;
@@ -246,5 +234,5 @@
 
 	/*Else, check that we are requesting a half of num*/
-	if (numindices>this->num) _error_("Cannot spawn hook with " << numindices << " objects from a Hook of " << this->num << " objects");
+	if(numindices>this->num) _error_("Cannot spawn hook with " << numindices << " objects from a Hook of " << this->num << " objects");
 
 	/*go pickup the correct objects, ids and offsets :*/
@@ -252,12 +240,12 @@
 	if(output->num<1) _error_("Trying to spawn an empty ElementProperties!");
 
-	output->objects=xNew<Object*>(output->num);
-	output->ids=xNew<int>(output->num);
-	output->offsets=xNew<int>(output->num);
-
-	for(i=0;i<output->num;i++){
-		output->objects[i]=this->objects[indices[i]];
-		output->ids[i]=this->ids[indices[i]];
-		output->offsets[i]=this->offsets[indices[i]];
+	output->objects = xNew<Object*>(output->num);
+	output->ids     = xNew<int>(output->num);
+	output->offsets = xNew<int>(output->num);
+
+	for(int i=0;i<output->num;i++){
+		output->objects[i] = this->objects[indices[i]];
+		output->ids[i]     = this->ids[indices[i]];
+		output->offsets[i] = this->offsets[indices[i]];
 	}
 
Index: /issm/trunk-jpl/src/c/classes/Hook.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Hook.h	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/Hook.h	(revision 13413)
@@ -19,8 +19,8 @@
 	private: 
 
-		int	   num; //number of objects being hooked onto
-		Object**	   objects; //list of object pointers. we do not allocate objects, just a list a pointers, that will get to point to the real objects from a dataset.
-		int*   ids;     //list of object ids, to go look for them in datasets.
-		int*   offsets;  //list of object offsets into datasets, to speed up lookup.
+		int      num;       //number of objects being hooked onto
+		Object **objects;   //list of object pointers
+		int     *ids;       //list of object ids, to go look for them in datasets.
+		int     *offsets;   //list of object offsets into datasets, to speed up lookup.
 
 	public:
Index: /issm/trunk-jpl/src/c/classes/IoModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/IoModel.cpp	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/IoModel.cpp	(revision 13413)
@@ -24,18 +24,18 @@
 /*FUNCTION IoModel::IoModel(){{{*/
 IoModel::IoModel(){
-	this->fid=NULL;
-	this->data=NULL;
-	this->independents=NULL;
-	this->constants=NULL;
-	
-	this->my_elements=NULL;
-	this->my_nodes=NULL;
-	this->my_vertices=NULL;
-	this->singlenodetoelementconnectivity=NULL;
-	this->numbernodetoelementconnectivity=NULL;
-	
-	this->nodecounter=0;
-	this->loadcounter=0;
-	this->constraintcounter=0;
+	this->fid          = NULL;
+	this->data         = NULL;
+	this->independents = NULL;
+	this->constants    = NULL;
+	
+	this->my_elements                     = NULL;
+	this->my_nodes                        = NULL;
+	this->my_vertices                     = NULL;
+	this->singlenodetoelementconnectivity = NULL;
+	this->numbernodetoelementconnectivity = NULL;
+	
+	this->nodecounter       = 0;
+	this->loadcounter       = 0;
+	this->constraintcounter = 0;
 }
 /*}}}*/
@@ -62,13 +62,13 @@
 	
 	/*Initialize permanent data: */
-	this->my_elements=NULL;
-	this->my_nodes=NULL;
-	this->my_vertices=NULL;
-	this->singlenodetoelementconnectivity=NULL;
-	this->numbernodetoelementconnectivity=NULL;
-	
-	this->nodecounter=0;
-	this->loadcounter=0;
-	this->constraintcounter=0;
+	this->my_elements                     = NULL;
+	this->my_nodes                        = NULL;
+	this->my_vertices                     = NULL;
+	this->singlenodetoelementconnectivity = NULL;
+	this->numbernodetoelementconnectivity = NULL;
+	
+	this->nodecounter       = 0;
+	this->loadcounter       = 0;
+	this->constraintcounter = 0;
 }
 /*}}}*/
@@ -200,13 +200,11 @@
 void  IoModel::DeleteData(int num,...){
 
-	va_list ap;
-	int     dataenum;
-	int     i;
-	DoubleMatParam* parameter=NULL;
+	va_list         ap;
+	int             dataenum;
+	DoubleMatParam *parameter = NULL;
 
 	/*Go through the entire list of enums and delete the corresponding data from the iomodel-data dataset: */
-
 	va_start(ap,num);
-	for(i = 0; i <num; i++){
+	for(int i=0; i<num; i++){
 		dataenum=va_arg(ap, int);
 		_assert_(dataenum<MaximumNumberOfEnums);
@@ -217,5 +215,5 @@
 	va_end(ap);
 } /*}}}*/
-/*FUNCTION IoModel::DeleteData(IssmDouble* {{{*/
+/*FUNCTION IoModel::DeleteData(IssmDouble* vector, int dataenum) {{{*/
 void  IoModel::DeleteData(IssmDouble* vector, int dataenum){
 
@@ -475,5 +473,4 @@
 	#endif
 
-	/*cast to bool: */
 	/*Assign output pointers: */
 	*pboolean=(bool)booleanint;
@@ -514,6 +511,6 @@
 
 	/*output: */
-	IssmPDouble   scalar;
-	int      code;
+	IssmPDouble scalar;
+	int         code;
 
 	/*Set file pointer to beginning of the data: */
@@ -550,6 +547,4 @@
 	if(code!=4)_error_("expecting a string for enum " << EnumToStringx(data_enum));
 	
-	/*Now fetch: */
-	
 	/*We have to read a string from disk. First read the dimensions of the string, then the string: */
 	if(my_rank==0){  
@@ -578,5 +573,4 @@
 		string[0]='\0';
 	}
-
 
 	/*Assign output pointers: */
@@ -603,6 +597,4 @@
 	if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum));
 	
-	/*Now fetch: */
-
 	/*We have to read a matrix from disk. First read the dimensions of the matrix, then the whole matrix: */
 	/*numberofelements: */
@@ -673,6 +665,4 @@
 	if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum));
 	
-	/*Now fetch: */
-
 	/*We have to read a matrix from disk. First read the dimensions of the matrix, then the whole matrix: */
 	/*numberofelements: */
@@ -794,12 +784,11 @@
 
 	int i;
-
 	extern int my_rank;
 
 	/*output: */
-	IssmDouble** matrices=NULL;
-	int*     mdims=NULL;
-	int*     ndims=NULL;
-	int      numrecords=0;
+	IssmDouble **matrices   = NULL;
+	int         *mdims      = NULL;
+	int         *ndims      = NULL;
+	int          numrecords = 0;
 
 	/*intermediary: */
@@ -930,15 +919,15 @@
 void  IoModel::FetchData(int num,...){
 
-	va_list ap;
-	int     dataenum;
-	IssmDouble* matrix=NULL;
-	int     M,N;
-	int     i;
-
-	/*Go through the entire list of enums and fetch the corresponding data. Add it to the iomodel->data dataset. Everything
-	 *we fetch is a IssmDouble* : */
+	va_list     ap;
+	int         dataenum;
+	IssmDouble *matrix   = NULL;
+	int         M,N;
+
+	/*Go through the entire list of enums and fetch the corresponding data.
+	 * Add it to the iomodel->data dataset. Everything
+	 * we fetch is a IssmDouble* : */
 	
 	va_start(ap,num);
-	for(i=0; i<num; i++){
+	for(int i=0; i<num; i++){
 		
 		dataenum=va_arg(ap, int);
@@ -964,5 +953,4 @@
 	}
 	va_end(ap);
-
 }
 /*}}}*/
@@ -982,5 +970,4 @@
 	int     nel;
 	int     numberofelements;
-
 
 	/*variables being fetched: */
@@ -1309,6 +1296,4 @@
 	if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(independent_enum));
 	
-	/*Now fetch: */
-
 	/*We have to read a matrix from disk. First read the dimensions of the matrix, then the whole matrix: */
 	/*numberofelements: */
Index: /issm/trunk-jpl/src/c/classes/IoModel.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/IoModel.h	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/IoModel.h	(revision 13413)
@@ -19,11 +19,11 @@
 
 	private: 
-		Parameters  *constants;   //this dataset holds all IssmDouble, int, bool and char *parameters read in from the input file.*
+		Parameters *constants;   //this dataset holds all IssmDouble, int, bool and char from input
 	
 	public:
-		IssmDouble **data;        //this dataset holds temporary data, memory intensive.
+		IssmDouble **data;   //this dataset holds temporary data, memory intensive.
 		
 		/*This data needs to stay memory resident at all time, even if it's memory intensive: */
-		FILE *fid;         //pointer to input file
+		FILE *fid;                               //pointer to input file
 		bool *my_elements;
 		bool *my_nodes;
Index: /issm/trunk-jpl/src/c/classes/Patch.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Patch.cpp	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/Patch.cpp	(revision 13413)
@@ -3,5 +3,5 @@
  */
 
-/*Include files: {{{*/
+/*Include files */
 #ifdef HAVE_CONFIG_H
 	#include <config.h>
@@ -19,14 +19,13 @@
 #include "../shared/shared.h"
 #include "../include/include.h"
-/*}}}*/
 
 /*Object constructors and destructors:*/
 /*FUNCTION Patch::Patch() default constructor {{{*/
 Patch::Patch(){
-	this->numrows=0;
-	this->numcols=0;
-	this->maxvertices=0;
-	this->maxnodes=0;
-	this->values=NULL;
+	this->numrows     = 0;
+	this->numcols     = 0;
+	this->maxvertices = 0;
+	this->maxnodes    = 0;
+	this->values      = NULL;
 }
 /*}}}*/
@@ -34,9 +33,7 @@
 Patch::Patch(int in_numrows, int in_maxvertices, int in_maxnodes){
 
-	int i,j;
 	this->numrows=in_numrows;
 	this->maxvertices=in_maxvertices;
 	this->maxnodes=in_maxnodes;
-    
 	this->numcols=1  //enum_type
 		+1           //step
@@ -52,7 +49,7 @@
 	}
 	else{
-	        this->values=xNew<IssmDouble>(this->numcols*this->numrows);
-		for(i=0;i<this->numrows;i++){
-			for(j=0;j<this->numcols;j++){
+		this->values=xNew<IssmDouble>(this->numcols*this->numrows);
+		for(int i=0;i<this->numrows;i++){
+			for(int j=0;j<this->numcols;j++){
 				this->values[i*this->numcols+j]=NAN;
 			}
@@ -98,6 +95,5 @@
 
 	/*Let's remember what is on a row: 
-	 enum_type step time element_id interpolation vertices_ids nodal_values
-	 */
+	 enum_type step time element_id interpolation vertices_ids nodal_values */
 	row[0]=enum_type;
 	row[1]=(IssmDouble)step;
Index: /issm/trunk-jpl/src/c/classes/Patch.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Patch.h	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/Patch.h	(revision 13413)
@@ -20,5 +20,4 @@
 */
 
-
 #ifndef _PATCH_H_
 #define  _PATCH_H_
@@ -29,10 +28,9 @@
 	public:
 
-		int     numrows; //number of results held in Patch object
-		int     numcols; //number of columns
-		int     maxvertices; //maxvertices corresponds to largest amount of vertices on a given element, determined by the geometry.
-		int     maxnodes;    // maxnodes corresponds to the largest amout of nodes on a given element, determined by the interpolation type.
-		
-		IssmDouble* values;  //result values
+		int         numrows;       //number of results held in Patch object
+		int         numcols;       //number of columns
+		int         maxvertices;   //largest amount of vertices on a given element, determined by geometry
+		int         maxnodes;      //the largest amout of nodes on a given element, determined by interpolation
+		IssmDouble *values;        //result values
 
 		Patch();
Index: /issm/trunk-jpl/src/c/classes/Update.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Update.h	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/Update.h	(revision 13413)
@@ -33,3 +33,2 @@
 
 #endif //ifndef _UPDATE_H_
-
Index: /issm/trunk-jpl/src/c/classes/objects/Contour.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Contour.h	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/objects/Contour.h	(revision 13413)
@@ -22,18 +22,18 @@
 	public: 
 
-		int     id;
-		int	  nods;  //number of vertices in the contour
-		doubletype* x;
-		doubletype* y;
-		bool    closed; //is this contour closed?
+		int         id;
+		int         nods;     //number of vertices in the contour
+		doubletype *x;
+		doubletype *y;
+		bool        closed;   //is this contour closed?
 
 		/*Contour constructors, destructors :*/
-		/*FUNCTION Contour() default constructor {{{*/
+		/*FUNCTION Contour() {{{*/
 		Contour(){
-			this->id=0;
-			this->nods=0;
-			this->x=NULL;
-			this->y=NULL;
-			this->closed=false;
+			this->id     = 0;
+			this->nods   = 0;
+			this->x      = NULL;
+			this->y      = NULL;
+			this->closed = false;
 		}
 		/*}}}*/
@@ -41,7 +41,7 @@
 		Contour(int pid,int pnods, doubletype* px, doubletype* py,bool pclosed){
 
-			this->id=pid;
-			this->nods=pnods;
-			this->closed=pclosed;
+			this->id     = pid;
+			this->nods   = pnods;
+			this->closed = pclosed;
 			if(nods){
 				this->x=xNew<doubletype>(nods);
@@ -52,5 +52,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Contour() default constructor {{{*/
+		/*FUNCTION ~Contour() {{{*/
 		~Contour(){
 			xDelete<doubletype>(this->x);
@@ -59,18 +59,14 @@
 		/*}}}*/
 
-
 		/*Object virtual function resolutoin: */
 		/*FUNCTION Echo(){{{*/
 		void Echo(void){
-
-			int i;
-
-			_printLine_("Contour: " << id);
-			_printLine_("   nods: " << nods);
-			_printLine_("   closed: " << (closed?"true":"false"));
+			_printLine_(" Contour: " << id);
+			_printLine_("    nods: " << nods);
+			_printLine_("  closed: " << (closed?"true":"false"));
 			if(nods){
-				_printLine_("   x,y:");
-				for(i=0;i<nods;i++){
-					_printLine_(i << ": " << x[i] << "|" << y[i]);
+				_printLine_("   x , y:");
+				for(int i=0;i<nods;i++){
+					_printLine_(i << ": " << x[i] << " | " << y[i]);
 				}
 			}
@@ -88,7 +84,6 @@
 		/*}}}*/
 		/*FUNCTION MyRank{{{*/
-		int    MyRank(void){ 
+		int MyRank(void){ 
 			extern int my_rank;
-
 			return my_rank; 
 		}
@@ -96,14 +91,10 @@
 		/*FUNCTION ObjectEnum{{{*/
 		int ObjectEnum(void){
-
 			return ContourEnum;
-
 		}
 		/*}}}*/
 		/*FUNCTION copy {{{*/
 		Object* copy() {
-
 			return new Contour(*this); 
-
 		}
 		/*}}}*/
Index: /issm/trunk-jpl/src/c/classes/objects/Node.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Node.h	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/objects/Node.h	(revision 13413)
@@ -25,12 +25,12 @@
 	public: 
 
-		int	    id;  //unique arbitrary id.
-		int     sid; //sid for "serial" id, ie the rank of this node in the nodes dataset, if the dataset was serial on 1 cpu.
+		int id;    //unique arbitrary id.
+		int sid;   //"serial" id (rank of this node if the dataset was serial on 1 cpu)
 				
-		DofIndexing    indexing;
-		Hook*          hvertex;
-		Inputs*        inputs; //properties of this node
-		int            analysis_type;
-		IssmDouble         coord_system[3][3];
+		DofIndexing  indexing;
+		Hook        *hvertex;
+		Inputs      *inputs;               //properties of this node
+		int          analysis_type;
+		IssmDouble   coord_system[3][3];
 
 		/*Node constructors, destructors {{{*/
@@ -48,5 +48,4 @@
 		/*}}}*/
 		/*Update virtual functions definitions: {{{*/
-		
 		void  InputUpdateFromVector(IssmDouble* vector, int name, int type);
 		void  InputUpdateFromVector(int* vector, int name, int type);
@@ -98,7 +97,4 @@
 		void   VecMerge(Vector<IssmDouble>* ug, IssmDouble* vector_serial,int setenum);
 		void   VecReduce(Vector<IssmDouble>* vector, IssmDouble* ug_serial,int setnum);
-		
-		/*}}}*/
-		/*Dof Object routines {{{*/
 		void  DistributeDofs(int* pdofcount,int setenum);
 		void  OffsetDofs(int dofcount,int setenum);
Index: /issm/trunk-jpl/src/c/classes/objects/Object.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Object.h	(revision 13412)
+++ /issm/trunk-jpl/src/c/classes/objects/Object.h	(revision 13413)
@@ -20,5 +20,4 @@
 		virtual void  DeepEcho()=0;
 		virtual int   Id()=0;
-		virtual int   MyRank()=0;
 		virtual int   ObjectEnum()=0;
 		virtual Object* copy()=0;