diff --git a/Applications/Rasterization/otbRasterization.cxx b/Applications/Rasterization/otbRasterization.cxx
index d3dfc0821c45cf390c9d662bfc72f58b14d3e4bd..a4f802f9d3f723314c9c5d3b6e352feb507073d2 100644
--- a/Applications/Rasterization/otbRasterization.cxx
+++ b/Applications/Rasterization/otbRasterization.cxx
@@ -147,7 +147,7 @@ private:
   
   
   void DoExecute()
-    {    
+    {
     UInt8ImageType::Pointer referenceImage;
 
     m_OgrDS = otb::ogr::DataSource::New(GetParameterString("in"), otb::ogr::DataSource::Modes::read);
@@ -164,7 +164,7 @@ private:
     std::string inputProjectionRef = lit->GetProjectionRef();
 
     // Check if we have layers with different projection ref
-    for(;lit != m_OgrDS->end();++lit)
+    for(; lit != m_OgrDS->end(); ++lit)
       {
       if(lit->GetProjectionRef() != inputProjectionRef)
         {
@@ -195,8 +195,8 @@ private:
       extentAvailable = false;
       }
 
-    if(!extentAvailable && 
-       (!(HasValue("spx") && HasValue("spy")) 
+    if(!extentAvailable &&
+       (!(HasValue("spx") && HasValue("spy"))
         || (!(HasValue("orx") && HasValue("ory")))))
       {
       otbAppLogWARNING(<<"Failed to retrieve the spatial extent of the dataset. The application will retry in force mode,  which means it might have to walk the entire dataset to determine extent. This might be a long process for large datasets. Consider setting the orx, ory, spx and spy parameters.");
diff --git a/Code/Common/otbOGRDataSourceToLabelImageFilter.h b/Code/Common/otbOGRDataSourceToLabelImageFilter.h
index 15e87537f573a8ab41f8038bc26a8a719ae857fc..10f8f84b44cf20974ec917fa5d7452f40b15c5ad 100644
--- a/Code/Common/otbOGRDataSourceToLabelImageFilter.h
+++ b/Code/Common/otbOGRDataSourceToLabelImageFilter.h
@@ -160,7 +160,7 @@ private:
   OutputSpacingType             m_OutputSpacing;
   OutputOriginType              m_OutputOrigin;
   OutputSizeType                m_OutputSize;
-  OutputIndexType               m_OutputStartIndex;  
+  OutputIndexType               m_OutputStartIndex;
   OutputImageInternalPixelType  m_BackgroundValue;
   OutputImageInternalPixelType  m_ForegroundValue;
   bool                          m_BurnAttributeMode;
diff --git a/Code/Common/otbOGRDataSourceToLabelImageFilter.txx b/Code/Common/otbOGRDataSourceToLabelImageFilter.txx
index 6af73ae3746f709bf1b12b447c5ef4d0b15a38ad..552f87d86f96ca25a14a6998c29970bb272610dd 100644
--- a/Code/Common/otbOGRDataSourceToLabelImageFilter.txx
+++ b/Code/Common/otbOGRDataSourceToLabelImageFilter.txx
@@ -27,8 +27,8 @@ namespace otb
 {
 template< class TOutputImage>
 OGRDataSourceToLabelImageFilter<TOutputImage>
-::OGRDataSourceToLabelImageFilter() : m_BurnAttribute("DN"), 
-                                      m_BackgroundValue(0), 
+::OGRDataSourceToLabelImageFilter() : m_BurnAttribute("DN"),
+                                      m_BackgroundValue(0),
                                       m_ForegroundValue(255),
                                       m_BurnAttributeMode(true)
 {
@@ -199,7 +199,7 @@ OGRDataSourceToLabelImageFilter<TOutputImage>::GenerateData()
   GDALSetProjection (dataset, this->GetOutput()->GetProjectionRef().c_str());
 
   // Set the nodata value
-  for(unsigned int band = 0; band < nbBands;++band)
+  for(unsigned int band = 0; band < nbBands; ++band)
     {
      GDALRasterBandH hBand = GDALGetRasterBand(dataset, band + 1);
      GDALFillRaster(hBand, m_BackgroundValue, 0);
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx
index f6401d18586731311b3d6ba3dc946314c6d01032..d8319220d71067882324d2bad5501da4dcd19642 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx
@@ -49,8 +49,8 @@ struct ProcessVisitor : boost::static_visitor<>
     assert(source && "can't filter a nil datasource");
     assert(destination && "can't filter to a nil datasource");
     for (otb::ogr::DataSource::const_iterator b = source->begin(), e = source->end()
- ; b != e
- ; ++b
+; b != e
+; ++b
     )
       {
       otb::ogr::Layer const& sourceLayer = *b;
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx
index edb33c7681ec33f3ce44c764613d73753e4d6fe2..c6636911d999bf6c4a218a53234d9a9b7995ea0b 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx
@@ -402,17 +402,17 @@ int otb::ogr::DataSource::Size(bool doForceComputation) const
 /*=================================[ Misc ]==================================*/
 /*===========================================================================*/
 
-void otb::ogr::DataSource::GetGlobalExtent(double & ulx, 
-                                           double & uly, 
-                                           double & lrx, 
-                                           double & lry, 
+void otb::ogr::DataSource::GetGlobalExtent(double & ulx,
+                                           double & uly,
+                                           double & lrx,
+                                           double & lry,
                                            bool force) const
 {
   OGREnvelope sExtent;
   const_iterator lit = this->begin();
   
   if(lit==this->end())
-    { 
+    {
     itkGenericExceptionMacro(<< "Cannot compute global extent because there are no layers in the DataSource");
     }
 
@@ -427,7 +427,7 @@ void otb::ogr::DataSource::GetGlobalExtent(double & ulx,
   
   ++lit;
 
-  for(; lit!=this->end();++lit)
+  for(; lit!=this->end(); ++lit)
     {
      OGREnvelope cExtent;
      
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h
index 3600e114aa940f5507f2f780f6f5193d4339d4ad..1e67896b45335c6031764d9ee9667339739bd67b 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h
@@ -225,7 +225,7 @@ public:
    *  available. May force the driver to walk all geometries to
    *  compute the extent.
    *  \throw itk::ExceptionObject if the layers extents can not be retrieved.
-   */ 
+   */
   void GetGlobalExtent(double & ulx, double & uly, double & lrx, double & lry, bool force = false) const;
 
 
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx
index 430ece35a908ca2e9150a055fea1939d24aad4f5..a65dead39700c521f5671caa836e7c4cdf6d6d86 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx
@@ -171,7 +171,7 @@ void otb::ogr::Layer::GetExtent(double& ulx, double& uly, double& lrx, double& l
   ulx = sExtent.MinX;
   uly = sExtent.MinY;
   lrx = sExtent.MaxX;
-  lry = sExtent.MaxY;  
+  lry = sExtent.MaxY;
 }
 
 OGRLayer & otb::ogr::Layer::ogr()
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h
index e8b9eae44eeff01e0a776a5842f25f0883a54ec7..f8ff643237d7b0b452537362709ca958bd25b531 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h
@@ -202,7 +202,7 @@ public:
    *  available. May force the driver to walk all geometries to
    *  compute the extent.
    *  \throw itk::ExceptionObject if the extent can not be retrieved.
-  */ 
+  */
   void GetExtent(double & ulx, double & uly, double & lrx, double & lry, bool force = false) const;
 
   /** Prints self into stream. */
diff --git a/Testing/Code/DisparityMap/otbDisparityMapTests4.cxx b/Testing/Code/DisparityMap/otbDisparityMapTests4.cxx
index 510317a53fbbb635442bbf867872060e874fa84a..537235fb0f364a89569bd7da9bd6fbd950cebe4b 100644
--- a/Testing/Code/DisparityMap/otbDisparityMapTests4.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityMapTests4.cxx
@@ -31,5 +31,5 @@ void RegisterTests()
   REGISTER_TEST(otbPixelWiseBlockMatchingImageFilter);
   REGISTER_TEST(otbPixelWiseBlockMatchingImageFilterNCC);
   REGISTER_TEST(otbSubPixelDisparityImageFilter);
-  REGISTER_TEST(otbSubPixelDisparityImageFilterNew);              
+  REGISTER_TEST(otbSubPixelDisparityImageFilterNew);
 }