diff --git a/Code/ApplicationEngine/otbWrapperApplication.cxx b/Code/ApplicationEngine/otbWrapperApplication.cxx
index 12c572f58a547a608bbc9a9a585566fe9837cbd1..862c7b2fa009a1a4f0aff73b16156a843a971102 100644
--- a/Code/ApplicationEngine/otbWrapperApplication.cxx
+++ b/Code/ApplicationEngine/otbWrapperApplication.cxx
@@ -629,7 +629,7 @@ FloatVectorImageListType* Application::GetParameterImageList(std::string paramet
   Parameter* param = GetParameterByKey(parameter);
 
   if (dynamic_cast<InputImageListParameter*>(param))
-    {   
+    {
     InputImageListParameter* paramDown = dynamic_cast<InputImageListParameter*>(param);
     ret = paramDown->GetImageList();
     }
diff --git a/Code/Simulation/otbReduceSpectralResponse.h b/Code/Simulation/otbReduceSpectralResponse.h
index 6618593d21bc78ddbe5ce3ac1cf888f565fe16b0..b50bd1583b0f027945af820e137e5251956b20c5 100644
--- a/Code/Simulation/otbReduceSpectralResponse.h
+++ b/Code/Simulation/otbReduceSpectralResponse.h
@@ -75,20 +75,20 @@ public:
   typedef typename std::vector<ValuePrecisionType> ReduceSpectralResponseVectorType;
   /** Standard macros */
   itkNewMacro(Self)
-  ;itkTypeMacro(ReduceSpectralResponse, DataObject)
-  ;
+ ; itkTypeMacro(ReduceSpectralResponse, DataObject)
+ ;
 
   itkGetConstObjectMacro(InputSatRSR, InputRSRType)
-  ;itkSetObjectMacro(InputSatRSR, InputRSRType)
-  ;
+ ; itkSetObjectMacro(InputSatRSR, InputRSRType)
+ ;
 
   itkGetConstObjectMacro(InputSpectralResponse, InputSpectralResponseType)
-  ;itkSetObjectMacro(InputSpectralResponse, InputSpectralResponseType)
-  ;
+ ; itkSetObjectMacro(InputSpectralResponse, InputSpectralResponseType)
+ ;
 
   /** The GetReduceResponse method gives the output. The first value in the pair is the central wavelength of the band (see SpectralResponse). */
   itkGetObjectMacro(ReduceResponse, InputSpectralResponseType)
-  ;
+ ;
 
   /** Clear the vector data  */
   virtual bool Clear();
@@ -119,7 +119,7 @@ protected:
   virtual ~ReduceSpectralResponse()
   {
   }
-  ;
+ ;
   /** PrintSelf method */
   //void PrintSelf(std::ostream& os, itk::Indent indent) const;
 
diff --git a/Code/Simulation/otbSatelliteRSR.h b/Code/Simulation/otbSatelliteRSR.h
index 350326a2f8cf32655db1678822cbeb2bd3b8b8fe..d3dfbb17ce3ce412e17c3e6f82220d5657d61d1c 100644
--- a/Code/Simulation/otbSatelliteRSR.h
+++ b/Code/Simulation/otbSatelliteRSR.h
@@ -54,17 +54,17 @@ public:
 
   /** Standard macros */
   itkNewMacro(Self)
-  ;itkTypeMacro(SatelliteRSR, DataObject)
-  ;
+ ; itkTypeMacro(SatelliteRSR, DataObject)
+ ;
 
   /** Set the number of band of the satellite from an ASCII file
    * Need to parse first all the file to determine the number of columns */
   itkGetConstMacro(NbBands, unsigned int)
-  ;itkSetMacro(NbBands, unsigned int)
-  ;
+ ; itkSetMacro(NbBands, unsigned int)
+ ;
 
   itkSetMacro(SortBands, bool)
-  ;
+ ;
 
   /** Template parameters typedef */
   typedef TPrecision PrecisionType;
@@ -141,7 +141,7 @@ protected:
   virtual ~SatelliteRSR()
   {
   }
-  ;
+ ;
 
   bool m_SortBands;
 
diff --git a/Code/Simulation/otbSpectralResponse.h b/Code/Simulation/otbSpectralResponse.h
index 21a7ce3dfd4a3aaf9d1bf06a7ff3f7d8f8e309a6..14834f7df2eca2f85109019c0f1f6113ba74569d 100644
--- a/Code/Simulation/otbSpectralResponse.h
+++ b/Code/Simulation/otbSpectralResponse.h
@@ -79,12 +79,12 @@ public:
   typedef std::pair<TPrecision, TPrecision> IntervalType;
   /** Standard macros */
   itkNewMacro(Self)
-  ;itkTypeMacro(SpectralResponse, DataObject)
-  ;
+ ; itkTypeMacro(SpectralResponse, DataObject)
+ ;
 
   itkSetMacro(SensitivityThreshold, TPrecision)
-  ;itkGetConstMacro(SensitivityThreshold, TPrecision)
-  ;
+ ; itkGetConstMacro(SensitivityThreshold, TPrecision)
+ ;
 
   /** Clear the vector of data pairs  */
   virtual bool Clear();
@@ -153,7 +153,7 @@ protected:
   virtual ~SpectralResponse()
   {
   }
-  ;
+ ;
   /** PrintSelf method */
   //void PrintSelf(std::ostream& os, itk::Indent indent) const;
 
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.cxx b/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.cxx
index 58eecf0e451d877fc6868402465f4e789cefe6e7..67fadae127da032a10ad793f49ee6b6b229bfc1e 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.cxx
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.cxx
@@ -134,7 +134,7 @@ void QtWidgetInputImageListParameter::DoCreateWidget()
 
 }
 
-void 
+void
 QtWidgetInputImageListParameter::UpdateImageList()
 {
   // save value