diff --git a/Code/ApplicationEngine/otbWrapperApplication.cxx b/Code/ApplicationEngine/otbWrapperApplication.cxx
index 6163b5a98889433cdff6098313fb18c117b0d296..3604dc62c2dc87055e4bb15a3fb183309d193adc 100644
--- a/Code/ApplicationEngine/otbWrapperApplication.cxx
+++ b/Code/ApplicationEngine/otbWrapperApplication.cxx
@@ -656,8 +656,8 @@ std::string Application::GetParameterAsString(std::string paramKey)
   std::string ret;
   ParameterType type = this->GetParameterType( paramKey );
 
-  if( type == ParameterType_String || type == ParameterType_Filename 
-      || type == ParameterType_Directory || type == ParameterType_InputImage 
+  if( type == ParameterType_String || type == ParameterType_Filename
+      || type == ParameterType_Directory || type == ParameterType_InputImage
       || type == ParameterType_InputComplexImage || type == ParameterType_InputVectorData
       || type == ParameterType_OutputImage || type == ParameterType_OutputVectorData  )
     {
diff --git a/Code/ApplicationEngine/otbWrapperListViewParameter.h b/Code/ApplicationEngine/otbWrapperListViewParameter.h
index f56007a5bc5ecf6915f18f4f25e302a4558108c9..1b4b811ecbaf1354b44812be37b5f5022b9f517e 100644
--- a/Code/ApplicationEngine/otbWrapperListViewParameter.h
+++ b/Code/ApplicationEngine/otbWrapperListViewParameter.h
@@ -28,7 +28,7 @@ namespace Wrapper
 
 /** \class ListViewParameter
  *  \brief This class represent a ListWidget parameter for the wrapper framework
- * 
+ *
  * The row selected in the ListWidget are stored in a std::vector. The
  * method GetSelectedItems() allow the user to access to this method.
  *
diff --git a/Code/ApplicationEngine/otbWrapperParameterGroup.cxx b/Code/ApplicationEngine/otbWrapperParameterGroup.cxx
index f5729107832d43f5d4a6f25dcaa83890d2351b3e..94ba561de7a504f8bb7ae6376e56dadd7838648a 100644
--- a/Code/ApplicationEngine/otbWrapperParameterGroup.cxx
+++ b/Code/ApplicationEngine/otbWrapperParameterGroup.cxx
@@ -407,8 +407,8 @@ ParameterGroup::GetParameterByKey(std::string name)
         {
         if (associatedParam.IsNull())
           {
-          itkExceptionMacro(<< "Choice " << splittedName[1] << "in " 
-                            << splittedName[0] << "  has no key named " 
+          itkExceptionMacro(<< "Choice " << splittedName[1] << "in "
+                            << splittedName[0] << "  has no key named "
                             << splittedName[2]);
           }
 
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
index 9c3769743ed0a30b47428d60ad008c3297b02f79..2023efc789a95341322e1ff2fee1d7e55dfe197f 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
@@ -397,7 +397,7 @@ CommandLineLauncher::LoadParameters()
         outPixType = ImagePixelType_float;
       else if( values[0] == "double" )
         outPixType = ImagePixelType_double;
-      else 
+      else
         {
           return WRONGPARAMETERVALUE;
         }
@@ -420,7 +420,6 @@ CommandLineLauncher::LoadParameters()
 }
 
 
-
 void
 CommandLineLauncher::LinkWatchers()
 {
@@ -445,7 +444,7 @@ CommandLineLauncher::LinkWatchers()
            oss<< "Writing "<< param->GetName()<<"...";
 
            StandardFilterWatcher * watch = new StandardFilterWatcher(outputParam->GetWriter(), oss.str());
-           m_WatcherList.push_back( watch );          
+           m_WatcherList.push_back( watch );
         }
     }
 }
@@ -552,11 +551,11 @@ CommandLineLauncher::DisplayParameterHelp( const Parameter::Pointer & param, con
    // Display parameter description
   if( std::string(param->GetDescription()).size() != 0 )
     {
-      oss<<"\t   Description: "<<param->GetDescription()<< std::endl;;
+      oss<<"\t   Description: "<<param->GetDescription()<< std::endl; ;
     }
   else
     {
-      oss<<"\t   Description: none"<< std::endl;;
+      oss<<"\t   Description: none"<< std::endl; ;
     }
  
  // Display the type the parameter
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetListViewParameter.cxx b/Code/Wrappers/QtWidget/otbWrapperQtWidgetListViewParameter.cxx
index 470d0192841f798f4c89bc59f713ec7f95182bbf..e7d014a703220a90f31865b3beec7ed4ff5b3af3 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetListViewParameter.cxx
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetListViewParameter.cxx
@@ -27,7 +27,7 @@ namespace Wrapper
 
 QtWidgetListViewParameter::QtWidgetListViewParameter(ListViewParameter* param, QtWidgetModel* m)
 : QtWidgetParameterBase(m),
-  m_ListViewParam(param),m_LineHeight(20)
+  m_ListViewParam(param), m_LineHeight(20)
 {
 }