diff --git a/Code/OBIA/otbMeanShiftSegmentationFilter.h b/Code/OBIA/otbMeanShiftSegmentationFilter.h
index dd5f6177b15f77bc8362fca7f237ee0cf34923ba..b468ca4a27a2c77846a35228ab699b5c794658f1 100644
--- a/Code/OBIA/otbMeanShiftSegmentationFilter.h
+++ b/Code/OBIA/otbMeanShiftSegmentationFilter.h
@@ -27,7 +27,6 @@
 #include <itkConnectedComponentFunctorImageFilter.h>
 
 
-
 namespace otb {
 
 
@@ -74,7 +73,6 @@ private:
 
 
 
-
 /** \class MeanShiftSegmentationFilter
 *
 *  Performs segmentation of an image by chaining a mean shift filter and region
@@ -126,14 +124,12 @@ public:
   typedef typename RegionPruningFilterType::Pointer                                        RegionPruningFilterPointerType;
 
 
-
     typedef Functor::ConnectedLabelFunctor<InputLabelPixelType> LabelFunctorType;
 
     typedef itk::ConnectedComponentFunctorImageFilter<InputLabelImageType,InputLabelImageType,LabelFunctorType> RelabelComponentFilterType;
     typedef typename RelabelComponentFilterType::Pointer   RelabelComponentFilterPointerType;
 
 
-
   /** Sets the spatial bandwidth (or radius in the case of a uniform kernel)
     * of the neighborhood for each pixel
     */
diff --git a/Code/Projections/otbGenericRSTransform.txx b/Code/Projections/otbGenericRSTransform.txx
index 7eb45ea7eccfeee8b9367d6f823cfaff8fa7e2f4..11cc22a6a9f92817850b1df2f8485ab3a79fc50c 100644
--- a/Code/Projections/otbGenericRSTransform.txx
+++ b/Code/Projections/otbGenericRSTransform.txx
@@ -36,7 +36,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
                          m_DEMDirectory(""), m_GeoidFile(""),
                          m_AverageElevation(-32768.0),
                          m_OptimizeInputTransform(false),
-                         m_OptimizeOutputTransform(false), 
+                         m_OptimizeOutputTransform(false),
                          m_InputTiePoints(),
                          m_OutputTiePoints()
 
@@ -171,7 +171,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
       if(m_OptimizeInputTransform && !m_InputTiePoints.empty())
         {
         for(typename InputTiePointContainerType::const_iterator it = m_InputTiePoints.begin();
-            it!= m_InputTiePoints.end();++it)
+            it!= m_InputTiePoints.end(); ++it)
           {
           sensorModel->AddTiePoint(it->first,it->second);
           }
@@ -254,7 +254,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
       if(m_OptimizeOutputTransform && !m_OutputTiePoints.empty())
         {
         for(typename OutputTiePointContainerType::const_iterator it = m_OutputTiePoints.begin();
-            it!= m_OutputTiePoints.end();++it)
+            it!= m_OutputTiePoints.end(); ++it)
           {
           sensorModel->AddTiePoint(it->second,it->first);
           }
diff --git a/Code/Projections/otbSensorModelBase.txx b/Code/Projections/otbSensorModelBase.txx
index 02153a39b4c20e8654499c97f7d92bb5eccea9de..95101beccd383cb244923db5b5035384f98b75a1 100644
--- a/Code/Projections/otbSensorModelBase.txx
+++ b/Code/Projections/otbSensorModelBase.txx
@@ -90,7 +90,7 @@ SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
 template <class TScalarType,
     unsigned int NInputDimensions,
     unsigned int NOutputDimensions>
-void 
+void
 SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
 ::AddTiePoint(const InputPointType & inputPoint, const OutputPointType & outputPoint)
 {
@@ -101,7 +101,7 @@ SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
 template <class TScalarType,
     unsigned int NInputDimensions,
     unsigned int NOutputDimensions>
-void 
+void
 SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
 ::ClearTiePoints()
 {
@@ -112,7 +112,7 @@ SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
 template <class TScalarType,
     unsigned int NInputDimensions,
     unsigned int NOutputDimensions>
-double 
+double
 SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
 ::Optimize()
 {
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.cxx b/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.cxx
index c004dcf3b072748a114d38032ef21040ac2a385d..a8df4fbbb701be967a7c7f35f23cd209500b11bc 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.cxx
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.cxx
@@ -204,8 +204,8 @@ void SensorModelAdapter::AddTiePoint(double x, double y, double z, double lon, d
   if (this->m_UseDEM)
     {
     double height = this->m_DEMHandler->GetHeightAboveMSL(lon, lat);
-    if(!ossim::isnan(height))  
-      {  
+    if(!ossim::isnan(height))
+      {
       ossimGPoint.height(height);
       }
     }