diff --git a/Examples/changeFmaFormat.cpp b/Examples/changeFmaFormat.cpp
index 4070e937128d928c61bec6979d5510e001209188..50f55d28627e787e44c9a7d37c5b456e8bebd5ec 100644
--- a/Examples/changeFmaFormat.cpp
+++ b/Examples/changeFmaFormat.cpp
@@ -46,158 +46,162 @@
 //
 //
 void genDistusage() {
-	std::cout << "Driver to change the format of the input file"
-			<< std::endl;
-	std::cout <<	 "Options  "<< std::endl
-			<<     "   -help       to see the parameters    " << std::endl
-			<<     " Input:  only one option is allowed"  << std::endl
-			<<     "   -fin name:  file name  to convert (with extension .fma (ascii) or bfma (binary) " <<std::endl
-			<<     "   -fdlpoly name:  file name  to convert with extension (.bin if binary file) " <<std::endl
-			<<     "     Output " << std::endl
-			<<     "             -fout name: generic name for files (without extension) and save data" <<std::endl
-			<<     "                     with following format in name.fma or name.bfma if -bin is set" <<std::endl
-			<<     "      -bin save output in binary mode (name file  name.bfma)" <<std::endl
-			<<     "      -visufmt  vtk, vtp, cosmo or cvs format for visualization " <<std::endl;
+    std::cout << "Driver to change the format of the input file"
+	      << std::endl;
+    std::cout <<	 "Options  "<< std::endl
+	      <<     "   -help       to see the parameters    " << std::endl
+	      <<     " Input:  only one option is allowed"  << std::endl
+	      <<     "   -fin name:  file name  to convert (with extension .fma (ascii) or bfma (binary) " <<std::endl
+	      <<     "   -fdlpoly name:  file name  to convert with extension (.bin if binary file) " <<std::endl
+	      <<     "     Output " << std::endl
+	      <<     "             -fout name: generic name for files (without extension) and save data" <<std::endl
+	      <<     "                     with following format in name.fma or name.bfma if -bin is set" <<std::endl
+	      <<     "      -bin save output in binary mode (name file  name.bfma)" <<std::endl
+	      <<     "      -visufmt  vtk, vtp, cosmo or cvs format for visualization " <<std::endl;
 }
 
 int main(int argc, char ** argv){
+    //
+    if(FParameters::existParameter(argc, argv, "-h")||FParameters::existParameter(argc, argv, "-help")|| (argc < 3 )){
+	genDistusage() ;
+	exit(-1);
+    }
+    FSize NbPoints;
+    FReal	 * particles = nullptr ;
+    FFmaGenericLoader * loader;
+    unsigned int nbData;
+
+    if (FParameters::existParameter(argc, argv, "-fin")) {
+	const std::string filename(FParameters::getStr(argc,argv,"-fin",   "data.fma"));
+
+	loader = new FFmaGenericLoader(filename);
+	//
+	// Allocation
+	//
+	NbPoints                              = loader->getNumberOfParticles();
+	nbData   = loader->getNbRecordPerline() ;
+	const unsigned int arraySize =nbData*NbPoints;
+	//
+	particles = new FReal[arraySize] ;
+	std::memset(particles,0,arraySize*sizeof(FReal));
 	//
-	if(FParameters::existParameter(argc, argv, "-h")||FParameters::existParameter(argc, argv, "-help")|| (argc < 3 )){
-		genDistusage() ;
-		exit(-1);
+	// Read Data
+	int j = 0 ;
+	for(int idxPart = 0 ; idxPart < NbPoints ;++idxPart, j+=nbData){
+	    //		//
+	    loader->fillParticle(&particles[j],nbData);
+	    //		std::cout << "idxPart "<< idxPart << "  ";
+	    //		for (int jj= 0 ; jj<nbData ; ++jj, ++k){
+	    //			std::cout << particles[k] << "    ";
+	    //		}
+	    //		std::cout << std::endl;
 	}
-	FSize NbPoints;
-	FReal	 * particles = nullptr ;
-	if (FParameters::existParameter(argc, argv, "-fin")) {
-		const std::string filename(FParameters::getStr(argc,argv,"-fin",   "data.fma"));
+	//		if(FParameters::existParameter(argc, argv, "-fdlpoly")){
+	//			FDlpolyLoader  *loader = nullptr ;
+	//			//			if(FParameters::existParameter(argc, argv, "-bin")){
+	// //				loader  = new FDlpolyBinLoader(filenameEwaldIn.c_str());
+	// //			}
+	// //			else {
+	// //				loader  = new FDlpolyAsciiLoader(filenameEwaldIn.c_str());
+	// //			}
+	//			//				NbPoints = loader->getNumberOfParticles()  ;
+	//			//				particles = new FReal[arraySize] ;
+	//			//				std::memset(particles,0,arraySize*sizeof(FReal));
+	//			//				for(int idxPart = 0 ; idxPart < NbPoints ; ++idxPart){
+	//				//
+	//			//					int index ;
+	//			//				FPoint P ; FReal t[3];
+	// ///	/				loader->fillParticle(&P, t, &physicalValue,&index);
+	//			//				particles[(index-1)*]
+	//				//
+	// //				totalCharge += physicalValue ;
+	//				}
+    }
+    else {
+	genDistusage() ;
+	return 0;
+    }
 
-		FFmaGenericLoader loader(filename);
-		//
-		// Allocation
-		//
-		 NbPoints                              = loader.getNumberOfParticles();
-		const unsigned int nbData   = loader.getNbRecordPerline() ;
-		const unsigned int arraySize =nbData*NbPoints;
-		//
-		particles = new FReal[arraySize] ;
-		std::memset(particles,0,arraySize*sizeof(FReal));
-		//
-		// Read Data
-		int j = 0 ;
-		for(int idxPart = 0 ; idxPart < NbPoints ;++idxPart, j+=nbData){
-			//		//
-			loader.fillParticle(&particles[j],nbData);
-			//		std::cout << "idxPart "<< idxPart << "  ";
-			//		for (int jj= 0 ; jj<nbData ; ++jj, ++k){
-			//			std::cout << particles[k] << "    ";
-			//		}
-			//		std::cout << std::endl;
-		}
-		else if(FParameters::existParameter(argc, argv, "-fdlpoly")){
-			FDlpolyLoader  *loader = nullptr ;
-//			if(FParameters::existParameter(argc, argv, "-bin")){
-//				loader  = new FDlpolyBinLoader(filenameEwaldIn.c_str());
-//			}
-//			else {
-//				loader  = new FDlpolyAsciiLoader(filenameEwaldIn.c_str());
-//			}
-			//				NbPoints = loader->getNumberOfParticles()  ;
-			//				particles = new FReal[arraySize] ;
-			//				std::memset(particles,0,arraySize*sizeof(FReal));
-			//				for(int idxPart = 0 ; idxPart < NbPoints ; ++idxPart){
-				//
-			//					int index ;
-			//				FPoint P ; FReal t[3];
-///	/				loader->fillParticle(&P, t, &physicalValue,&index);
-			//				particles[(index-1)*]
-				//
-//				totalCharge += physicalValue ;
-				}
-		}
-		else {
-			genDistusage() ;
-		}
-		FReal totalPhysical Value ;
 
-		//
-		/////////////////////////////////////////////////////////////////////////
-		//                                           Save data
-		/////////////////////////////////////////////////////////////////////////
-		//
-		//  Generate file for ScalFMM FMAGenericLoader
-		//
-		if(FParameters::existParameter(argc, argv, "-fout")){
-			std::string name(FParameters::getStr(argc,argv,"-fout",   "output"));
-			std::string ext(".");
-			if(name.find(ext) !=std::string::npos) {
-				std::cout << "No file with extension permitted for output name : " << name << std::endl;
-				exit(-1);
-			}
-			if(  FParameters::existParameter(argc, argv, "-bin")){
-				name += ".bfma";
-			}
-			else {
-				name += ".fma";
-			}
-			FFmaGenericWriter writer(name) ;
-			writer.writeHeader( loader.getCenterOfBox(), loader.getBoxWidth() , NbPoints, sizeof(FReal), nbData) ;
-			writer.writeArrayOfReal(particles, nbData, NbPoints);
-		}
-		//
-		//   Generate file for visualization purpose
-		//
-		if(FParameters::existParameter(argc, argv, "-visufmt")){
-			std::string outfilename(FParameters::getStr(argc,argv,"-fout",   "output"));
-			std::string visufile(""), fmt(FParameters::getStr(argc,argv,"-visufmt",   "vtp"));
-			if( fmt == "vtp" ){
-				visufile = outfilename + ".vtp" ;
-			}
-			else	if( fmt == "vtk" ){
-				visufile = outfilename + ".vtk" ;
-			}
-			else if( fmt == "cosmo" ){
-				if(nbData !=4) {
-					std::cerr << "Cosmos export accept only 4 data per particles. here: "<<nbData<<std::endl;
-					std::exit(EXIT_FAILURE);
-				}
-				visufile = outfilename + ".cosmo" ;
-			}
-			else {
-				visufile =   outfilename + ".csv" ;
-			}
-			std::ofstream file( visufile, std::ofstream::out);
-			if(!file) {
-				std::cout << "Cannot open file."<< std::endl;
-				exit(-1)	;
-			}	//
-			//
-			// Export data in cvs format
-			//
-			if( fmt == "vtp" ){
-				std::cout << "Writes in XML VTP format  (visualization) in file "<< visufile <<std::endl ;
-				if(nbData==4){
-					exportVTKxml( file,  particles, NbPoints)   ;
-				}
-				else {
-					exportVTKxml( file,  particles, NbPoints,nbData)   ;
-				}
-			}
-			else		if( fmt == "vtk" ){
-				std::cout << "Writes in VTK format  (visualization) in file "<< visufile <<std::endl ;
-				exportVTK( file, particles, NbPoints,nbData)  ;
-			}
-			else if( fmt == "cosmo" ){
-				std::cout << "Writes in COSMO format  (visualization) in file "<< visufile <<std::endl ;
-				exportCOSMOS( file,  particles, NbPoints)   ;
-			}
-			else {
-				std::cout << "Writes in CVS format  (visualization) in file "<<visufile<<std::endl ;
-				exportCVS( file,  particles, NbPoints,nbData)  ;
-			}
-		}
-		//
-		delete particles ;
-
-		//
-		return 1;
+    //
+    /////////////////////////////////////////////////////////////////////////
+    //                                           Save data
+    /////////////////////////////////////////////////////////////////////////
+    //
+    //  Generate file for ScalFMM FMAGenericLoader
+    //
+    if(FParameters::existParameter(argc, argv, "-fout")){
+	std::string name(FParameters::getStr(argc,argv,"-fout",   "output"));
+	std::string ext(".");
+	if(name.find(ext) !=std::string::npos) {
+	    std::cout << "No file with extension permitted for output name : " << name << std::endl;
+	    exit(-1);
+	}
+	if(  FParameters::existParameter(argc, argv, "-bin")){
+	    name += ".bfma";
+	}
+	else {
+	    name += ".fma";
+	}
+	FFmaGenericWriter writer(name) ;
+	writer.writeHeader( loader->getCenterOfBox(), loader->getBoxWidth() , NbPoints, sizeof(FReal), nbData) ;
+	writer.writeArrayOfReal(particles, nbData, NbPoints);
+    }
+    //
+    //   Generate file for visualization purpose
+    //
+    if(FParameters::existParameter(argc, argv, "-visufmt")){
+	std::string outfilename(FParameters::getStr(argc,argv,"-fout",   "output"));
+	std::string visufile(""), fmt(FParameters::getStr(argc,argv,"-visufmt",   "vtp"));
+	if( fmt == "vtp" ){
+	    visufile = outfilename + ".vtp" ;
+	}
+	else	if( fmt == "vtk" ){
+	    visufile = outfilename + ".vtk" ;
 	}
+	else if( fmt == "cosmo" ){
+	    if(nbData !=4) {
+		std::cerr << "Cosmos export accept only 4 data per particles. here: "<<nbData<<std::endl;
+		std::exit(EXIT_FAILURE);
+	    }
+	    visufile = outfilename + ".cosmo" ;
+	}
+	else {
+	    visufile =   outfilename + ".csv" ;
+	}
+	std::ofstream file( visufile, std::ofstream::out);
+	if(!file) {
+	    std::cout << "Cannot open file."<< std::endl;
+	    exit(-1)	;
+	}	//
+	//
+	// Export data in cvs format
+	//
+	if( fmt == "vtp" ){
+	    std::cout << "Writes in XML VTP format  (visualization) in file "<< visufile <<std::endl ;
+	    if(nbData==4){
+		exportVTKxml( file,  particles, NbPoints)   ;
+	    }
+	    else {
+		exportVTKxml( file,  particles, NbPoints,nbData)   ;
+	    }
+	}
+	else		if( fmt == "vtk" ){
+	    std::cout << "Writes in VTK format  (visualization) in file "<< visufile <<std::endl ;
+	    exportVTK( file, particles, NbPoints,nbData)  ;
+	}
+	else if( fmt == "cosmo" ){
+	    std::cout << "Writes in COSMO format  (visualization) in file "<< visufile <<std::endl ;
+	    exportCOSMOS( file,  particles, NbPoints)   ;
+	}
+	else {
+	    std::cout << "Writes in CVS format  (visualization) in file "<<visufile<<std::endl ;
+	    exportCVS( file,  particles, NbPoints,nbData)  ;
+	}
+    }
+    //
+    delete particles ;
+
+    //
+    return 1;
+}