diff --git a/Applications/Util/otbVectorDataExtractROIApplication.cxx b/Applications/Util/otbVectorDataExtractROIApplication.cxx
index 27e0d8adb76a4f3c7c57e2c324d61bdb2b6ed0f1..ef69b4a03b08b6108a458a8e403386b5de3c172c 100644
--- a/Applications/Util/otbVectorDataExtractROIApplication.cxx
+++ b/Applications/Util/otbVectorDataExtractROIApplication.cxx
@@ -103,7 +103,7 @@ private:
   void DoUpdateParameters()
   {
     // Nothing to do here for the parameters : all are independent
-  } 
+  }
 
   void DoExecute()
   {
diff --git a/Applications/Util/otbVectorDataSetField.cxx b/Applications/Util/otbVectorDataSetField.cxx
index fc6cbec8c96e5a87d87c52a35f411bceb7708b3b..f1feb526a4426d116c504a0d5d13dce7dc205073 100644
--- a/Applications/Util/otbVectorDataSetField.cxx
+++ b/Applications/Util/otbVectorDataSetField.cxx
@@ -72,7 +72,7 @@ private:
   }
   
   void DoCreateParameters()
-  {  
+  {
     AddParameter(ParameterType_InputVectorData, "in", "Input");
     SetParameterDescription("in", "Input Vector Data");
     AddParameter(ParameterType_OutputVectorData, "out", "Output");
@@ -86,7 +86,7 @@ private:
 
   void DoUpdateParameters()
   {
-    // Nothing to do (for now)   
+    // Nothing to do (for now)
   }
   
   void DoExecute()
@@ -102,12 +102,12 @@ private:
       it.Get()->SetFieldAsString(GetParameterAsString("fn"), GetParameterAsString("fv"));
     }
 
-    SetParameterOutputVectorData("out",m_InputData);
+    SetParameterOutputVectorData("out", m_InputData);
 
   }
   
   VectorDataType::Pointer m_InputData;
-};  
+};
 
 }
 }
diff --git a/Applications/Util/otbVectorDataTransform.cxx b/Applications/Util/otbVectorDataTransform.cxx
index 44e18593e142ee915660683659dc018fcf1535b5..abc1e2794e21e456089e1f69d333d8ba452d4bfa 100644
--- a/Applications/Util/otbVectorDataTransform.cxx
+++ b/Applications/Util/otbVectorDataTransform.cxx
@@ -73,23 +73,23 @@ private:
     SetParameterDescription("transform.tx","Translation in the X direction");
     AddParameter(ParameterType_Float, "transform.ty", "Translation Y");
     SetParameterDescription("transform.ty","Translation in the Y direction");
-    SetDefaultParameterFloat("transform.tx",0.);
-    SetDefaultParameterFloat("transform.ty",0.);
+    SetDefaultParameterFloat("transform.tx", 0.);
+    SetDefaultParameterFloat("transform.ty", 0.);
       
-    AddParameter(ParameterType_Float, "transform.ro", "Rotation Angle");  
+    AddParameter(ParameterType_Float, "transform.ro", "Rotation Angle");
     SetParameterDescription("transform.ro","Angle of the rotation to apply in degrees");
-    SetDefaultParameterFloat("transform.ro",0.);
+    SetDefaultParameterFloat("transform.ro", 0.);
 
     AddParameter(ParameterType_Float, "transform.centerx", "Center X");
     SetParameterDescription("transform.centerx","The first coordinate of the rotation center");
     AddParameter(ParameterType_Float, "transform.centery", "Center Y");
     SetParameterDescription("transform.centery","The second coordinate of the rotation center");
-    SetDefaultParameterFloat("transform.centerx",0.);
-    SetDefaultParameterFloat("transform.centery",0.);
+    SetDefaultParameterFloat("transform.centerx", 0.);
+    SetDefaultParameterFloat("transform.centery", 0.);
 
     AddParameter(ParameterType_Float, "transform.scale", "Scale");
     SetParameterDescription("transform.scale","The scale to apply");
-    SetDefaultParameterFloat("transform.scale",1.);
+    SetDefaultParameterFloat("transform.scale", 1.);
   }
 
   void DoUpdateParameters()
@@ -112,7 +112,7 @@ private:
     m_VectorDataProj->SetOutputKeywordList(inImage->GetImageKeywordlist());
     m_VectorDataProj->SetOutputProjectionRef(inImage->GetProjectionRef());
     
-    // Set up the transform 
+    // Set up the transform
     m_Transform = TransformType::New();
     TransformType::ParametersType parameters(6);
 
diff --git a/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGenerator.cxx b/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGenerator.cxx
index b22b9509c8fecbdfd149d3b76ddbf972d1d8e568..47c76ab43078ff29206d1ed5ce361ea61a5b5d1c 100644
--- a/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGenerator.cxx
+++ b/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGenerator.cxx
@@ -60,12 +60,12 @@ namespace Wrapper
 
 
 #define otbDocHtmlBodyCodeMacro( value )                                         \
-  oss << "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier';\">"; \
+  oss << "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';\">"; \
   oss << value;                                                         \
   oss << "</p>";
 
 #define otbDocHtmlBodyBoldCodeMacro( value )                                     \
-  oss << "<span style=\" font-weight:600;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New,courier';\">"; \
+  oss << "<span style=\" font-weight:600;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';\">"; \
   oss << value;                                                         \
   oss << "</p></span>";
 
@@ -99,12 +99,12 @@ ApplicationHtmlDocGenerator::GenerateDoc(const Application::Pointer app, const s
     {
     for (unsigned int i = 0; i < app->GetDocTags().size() - 1; i++)
       {
-      tagList.append( app->GetDocTags()[i] ).append(", "); 
+      tagList.append( app->GetDocTags()[i] ).append(", ");
       }
-    tagList.append( app->GetDocTags()[app->GetDocTags().size() - 1]); 
+    tagList.append( app->GetDocTags()[app->GetDocTags().size() - 1]);
     otbDocHtmlBodyMacro( tagList );
     }
-  else 
+  else
     {
     otbDocHtmlBodyMacro( "None" );
     }
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
index 5af6173a9feb2a38a5083e120b93a98789e64253..0b75d9c3f45cb04b4b68ba2e5649f38cf569d16a 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
@@ -346,7 +346,7 @@ CommandLineLauncher::ParamResultType CommandLineLauncher::LoadParameters()
           }
         
         if (type == ParameterType_InputVectorDataList)
-          {          
+          {
           dynamic_cast<InputVectorDataListParameter *> (param.GetPointer())->SetListFromFileName(values);
           }
         else
@@ -466,7 +466,7 @@ CommandLineLauncher::ParamResultType CommandLineLauncher::LoadParameters()
     // Check if mandatory parameter are present and have value
     // A param has to be set if it is mandatory and :
     // is root OR its parent is active
-    // NB: a root parameter is not active    
+    // NB: a root parameter is not active
     bool mustBeSet = false;
     const bool hasValue = m_Application->HasValue(paramKey);
 
@@ -674,11 +674,11 @@ std::string CommandLineLauncher::DisplayParameterHelp(const Parameter::Pointer &
                     {
                     oss << "\t          Type: String (output image file name and optionally its pixel type)"
                         << std::endl;
-		    oss
+                  oss
                         << "\t          You can also add after the filename the output pixel type"
-			<< std::endl;
+                     << std::endl;
                     oss
-                        << "\t          Possible pixel types:{int8,uint8,int16,uint16,int32,uint32,float,double}"
+                        << "\t          Possible pixel types:{int8, uint8, int16, uint16, int32, uint32, float, double}"
                       << std::endl;
                     }
                   else