diff --git a/Applications/Radiometry/otbOpticalCalibration.cxx b/Applications/Radiometry/otbOpticalCalibration.cxx
index a34c8b82804e9367a4183e93acba52f0a310c120..b873e4eb82c720a61d78e8875476bc1faac6c5d5 100644
--- a/Applications/Radiometry/otbOpticalCalibration.cxx
+++ b/Applications/Radiometry/otbOpticalCalibration.cxx
@@ -256,14 +256,14 @@ namespace otb
               m_ReflectanceToSurfaceReflectanceFilter->UpdateOutputInformation();
               m_ReflectanceToSurfaceReflectanceFilter->SetUseGenerateParameters(false);
 
-	      std::ostringstream oss;
+             std::ostringstream oss;
               oss.str("");
               oss << m_AtmosphericParam;
 
-	      AtmosphericRadiativeTerms::Pointer atmoTerms =  m_ReflectanceToSurfaceReflectanceFilter->GetAtmosphericRadiativeTerms();
-              oss << std::endl << std::endl << atmoTerms ;
+             AtmosphericRadiativeTerms::Pointer atmoTerms =  m_ReflectanceToSurfaceReflectanceFilter->GetAtmosphericRadiativeTerms();
+              oss << std::endl << std::endl << atmoTerms;
 
-	      GetLogger()->Info("Atmospheric correction parameters : " + oss.str());
+             GetLogger()->Info("Atmospheric correction parameters : " + oss.str());
               //rescale the surface reflectance in milli-reflectance
 
               m_ReflectanceToSurfaceReflectanceFilter->UpdateOutputInformation();
diff --git a/Code/BasicFilters/otbMeanShiftImageFilter2.txx b/Code/BasicFilters/otbMeanShiftImageFilter2.txx
index d158d701eac2b167fe1d61001aa5276abd6ded55..ccd14cbc5e0b3d7f43940d6433c5132f087c1d72 100644
--- a/Code/BasicFilters/otbMeanShiftImageFilter2.txx
+++ b/Code/BasicFilters/otbMeanShiftImageFilter2.txx
@@ -405,7 +405,6 @@ MeanShiftImageFilter2<TInputImage, TOutputImage, TKernel, TNorm, TOutputMetricIm
  }
 
 
-
 template <class TInputImage, class TOutputImage, class TKernel, class TNorm, class TOutputMetricImage, class TOutputIterationImage>
 void
 MeanShiftImageFilter2<TInputImage, TOutputImage, TKernel, TNorm, TOutputMetricImage, TOutputIterationImage>
@@ -460,7 +459,6 @@ MeanShiftImageFilter2<TInputImage, TOutputImage, TKernel, TNorm, TOutputMetricIm
   unsigned int iteration = 0;
 
 
-
   // Pixel in the joint spatial-range domain
   RealVector jointPixel;
 
diff --git a/Code/BasicFilters/otbTileImageFilter.txx b/Code/BasicFilters/otbTileImageFilter.txx
index 12917050a3c353dc9904ecb32eeebc295de64316..471b72e3ad0d00cce6c49987c551c93796cd5682 100644
--- a/Code/BasicFilters/otbTileImageFilter.txx
+++ b/Code/BasicFilters/otbTileImageFilter.txx
@@ -110,12 +110,12 @@ TileImageFilter<TImage>
   typename ImageType::SizeType totalSize;
   totalSize.Fill(0);
 
-  for(unsigned int i = 0; i < m_Layout[0];++i)
+  for(unsigned int i = 0; i < m_Layout[0]; ++i)
     {
     totalSize[0]+=m_ColumnsSizes[i];
     }
 
-  for(unsigned int i = 0; i < m_Layout[1];++i)
+  for(unsigned int i = 0; i < m_Layout[1]; ++i)
     {
     totalSize[1]+=m_RowsSizes[i];
     }
@@ -221,13 +221,13 @@ TileImageFilter<TImage>
   typename RegionType::IndexType regionIndex = out2inRegion.GetIndex();
   
   // Compute tile offsets
-  for(unsigned int i = 0; i < tileXIndex;++i)
+  for(unsigned int i = 0; i < tileXIndex; ++i)
     {
     regionIndex[0]-=m_ColumnsSizes.at(i);
     }
 
   unsigned int tileYOffset = 0;
-  for(unsigned int i = 0; i < tileYIndex;++i)
+  for(unsigned int i = 0; i < tileYIndex; ++i)
     {
     regionIndex[1]-=m_RowsSizes.at(i);
     }
@@ -267,12 +267,12 @@ TileImageFilter<TImage>
   
 
   // Compute tile offsets
-  for(unsigned int i = 0; i < tileXIndex;++i)
+  for(unsigned int i = 0; i < tileXIndex; ++i)
     {
     regionIndex[0]+=m_ColumnsSizes.at(i);
     }
 
-  for(unsigned int i = 0; i < tileYIndex;++i)
+  for(unsigned int i = 0; i < tileYIndex; ++i)
     {
     regionIndex[1]+=m_RowsSizes.at(i);
     }
diff --git a/Code/DisparityMap/otbDisparityMapToDEMFilter.txx b/Code/DisparityMap/otbDisparityMapToDEMFilter.txx
index 8ad3173c0c2d993539d4b8bb833995b1a2c413c6..b0cc31feae02e40827ef218a77a31cd2a2768b02 100644
--- a/Code/DisparityMap/otbDisparityMapToDEMFilter.txx
+++ b/Code/DisparityMap/otbDisparityMapToDEMFilter.txx
@@ -627,7 +627,7 @@ DisparityMapToDEMFilter<TDisparityImage,TInputImage,TOutputDEMImage,TEpipolarGri
   RSTransformType::Pointer leftToGroundTransform = RSTransformType::New();
   RSTransformType::Pointer rightToGroundTransform = RSTransformType::New();
   
-  leftToGroundTransform->SetInputKeywordList(leftSensor->GetImageKeywordlist());  
+  leftToGroundTransform->SetInputKeywordList(leftSensor->GetImageKeywordlist());
   rightToGroundTransform->SetInputKeywordList(rightSensor->GetImageKeywordlist());
   
   if(m_DEMDirectory!="")