diff --git a/Code/IO/otbKmzProductWriter.h b/Code/IO/otbKmzProductWriter.h
index dcd1f4696b3b9bb0757752209d0fb821770f066a..8a014cbe34d90347c0134db734997b9dbdf59a88 100644
--- a/Code/IO/otbKmzProductWriter.h
+++ b/Code/IO/otbKmzProductWriter.h
@@ -110,7 +110,7 @@ public:
   typedef TransformType::OutputPointType                              OutputPointType;
 
   // Cast Image Filter
-  typedef itk::CastImageFilter<InputImageType, 
+  typedef itk::CastImageFilter<InputImageType,
                                VectorImage<OutputPixelType> >         CastFilterType;
 
   // std::pair description <-> legend (image)
diff --git a/Code/IO/otbKmzProductWriter.txx b/Code/IO/otbKmzProductWriter.txx
index 7439253cec097b0fb9eb14351f1e24f6d6610923..a51e65e4652b89a8be2fcba39e4634b54d12aea1 100644
--- a/Code/IO/otbKmzProductWriter.txx
+++ b/Code/IO/otbKmzProductWriter.txx
@@ -932,8 +932,8 @@ KmzProductWriter<TInputImage>
 template <class TInputImage>
 void
 KmzProductWriter<TInputImage>
-::GenerateKML(const std::string& pathname, int depth, 
-              int x, int y, double north, double south, 
+::GenerateKML(const std::string& pathname, int depth,
+              int x, int y, double north, double south,
               double east, double west)
 {
   std::ostringstream kmlname;
diff --git a/Code/IO/otbOGRIOHelper.h b/Code/IO/otbOGRIOHelper.h
index 87f0c8e205cbe37f74a1e11a79cbb6855412fc55..af06acf1add93264a8294ffe0251881cfa123927 100644
--- a/Code/IO/otbOGRIOHelper.h
+++ b/Code/IO/otbOGRIOHelper.h
@@ -63,10 +63,10 @@ public:
                                 OGRLayer * ogrCurrentLayer,
                                 OGRSpatialReference * oSRS);
 
-//  typedef  enum { UNKNOWN, FLOAT, DOUBLE } VectorDataComponentType;//unused (yet?)
+//  typedef  enum { UNKNOWN, FLOAT, DOUBLE } VectorDataComponentType; //unused (yet?)
 
-//  itkSetEnumMacro(ComponentType, VectorDataComponentType);//unused (yet?)
-//  itkGetEnumMacro(ComponentType, VectorDataComponentType);//unused (yet?)
+//  itkSetEnumMacro(ComponentType, VectorDataComponentType); //unused (yet?)
+//  itkGetEnumMacro(ComponentType, VectorDataComponentType); //unused (yet?)
 
 
 protected:
diff --git a/Examples/IO/ImageToKmzAndMapFileProductExample.cxx b/Examples/IO/ImageToKmzAndMapFileProductExample.cxx
index 63eb159ba594c3b6be2b6b57b202ff56f1f4df9a..0150abd2596fa144e331cdab8de0e05eec623b04 100644
--- a/Examples/IO/ImageToKmzAndMapFileProductExample.cxx
+++ b/Examples/IO/ImageToKmzAndMapFileProductExample.cxx
@@ -47,7 +47,6 @@
 #include "otbKmzProductWriter.h"
 #include "otbMapFileProductWriter.h"
 #include "otbGCPsToRPCSensorModelImageFilter.h"
-
 // Software Guide : EndCodeSnippet
 //
 
@@ -56,7 +55,7 @@ int main(int argc, char* argv[])
 
   if (argc < 6)
     {
-    std::cerr << "Usage: " << argv[0] 
+    std::cerr << "Usage: " << argv[0]
               << " infname outfname kmzFileName "
               <<"a1x a1y b1x b1y b1z ... aNx aNy aNz bNx bNy bNz" << std::endl;
     return EXIT_FAILURE;
@@ -79,7 +78,6 @@ int main(int argc, char* argv[])
 
   ReaderType::Pointer reader = ReaderType::New();
   reader->SetFileName(argv[1]);
-
 // Software Guide : EndCodeSnippet
 
 // Software Guide : BeginLatex
diff --git a/Testing/Code/IO/otbKmzProductWriter.cxx b/Testing/Code/IO/otbKmzProductWriter.cxx
index 741f7ef84a2f645ae785912ad7215fa3bd038873..d6f994e0fe67061cf06ce8a95c9cf7f51c36fda4 100644
--- a/Testing/Code/IO/otbKmzProductWriter.cxx
+++ b/Testing/Code/IO/otbKmzProductWriter.cxx
@@ -43,7 +43,7 @@ int otbKmzProductWriter(int argc, char* argv[])
   if (argc < 3)
     {
     std::cerr << "Usage: " << argv[0] << " infname demPath kmzFileName "
-              <<"a1x a1y b1x b1y b1z ... aNx aNy aNz bNx bNy bNz" 
+              <<"a1x a1y b1x b1y b1z ... aNx aNy aNz bNx bNy bNz"
               << std::endl;
     return EXIT_FAILURE;
     }
diff --git a/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx b/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx
index dd4542f466d80ab7127e0049fbb282db4aa479aa..438817c72e04fdcc2c99e89490b0811263834bb8 100644
--- a/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx
+++ b/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx
@@ -107,7 +107,7 @@ int otbGCPsToRPCSensorModelImageFilterCheckRpcModel(int argc, char* argv[])
 
   // Instancicate a GenericRSTransform in order to transform the
   // indexes, using the rpcModel estimated, into geographical
-  // coordiantes. 
+  // coordiantes.
   // The test will check for nan coordinates, and the distance between
   // geographical coordinates.
   
@@ -122,7 +122,7 @@ int otbGCPsToRPCSensorModelImageFilterCheckRpcModel(int argc, char* argv[])
     }
   grsTrasnform->InstanciateTransform();
 
-  // Test 
+  // Test
   GeoDistanceType::Pointer geoDistance = GeoDistanceType::New();
   bool isErrorDetected = false;
   
@@ -144,21 +144,21 @@ int otbGCPsToRPCSensorModelImageFilterCheckRpcModel(int argc, char* argv[])
     // Search for nans
     if ( vnl_math_isnan(transformedPoint[0]) || vnl_math_isnan(transformedPoint[1]) )
       {
-      std::cout << "Reference : "<< geoPoint 
-                <<" --> Result of the reprojection using the estimated RpcModel "<<  transformedPoint 
+      std::cout << "Reference : "<< geoPoint
+                <<" --> Result of the reprojection using the estimated RpcModel "<<  transformedPoint
                 << std::endl;
       std::cout<<"The result of the projection is nan, there is a problem with the estimated RpcModel "
                << std::endl<<std::endl;
-      isErrorDetected = true; 
+      isErrorDetected = true;
       }
     
     // Search for wrong projection results
     double residual = geoDistance->Evaluate(geoPoint, transformedPoint);
     if( residual > parseResult->GetParameterFloat("--ErrorAllowed"))
       {
-      std::cout << "Reference : "<< geoPoint 
+      std::cout << "Reference : "<< geoPoint
                 <<" --> Result of the reprojection using the estimated RpcModel "
-                << grsTrasnform->TransformPoint(point)  
+                << grsTrasnform->TransformPoint(point)
                 << std::endl
                 << " Residual ["<< residual << "] is higher than the tolerance ["
                 << parseResult->GetParameterFloat("--ErrorAllowed")
@@ -168,7 +168,7 @@ int otbGCPsToRPCSensorModelImageFilterCheckRpcModel(int argc, char* argv[])
       }
     }
   
-  // Is there an error 
+  // Is there an error
   if ( isErrorDetected )
     return EXIT_FAILURE;