diff --git a/Code/ApplicationEngine/otbWrapperApplication.cxx b/Code/ApplicationEngine/otbWrapperApplication.cxx
index b494825156ba9adca9dd0cedb8f7e82fafdf731e..64c57e09d1572b75998c8b8b2a95dd84e0d5d112 100644
--- a/Code/ApplicationEngine/otbWrapperApplication.cxx
+++ b/Code/ApplicationEngine/otbWrapperApplication.cxx
@@ -891,8 +891,8 @@ Application::IsApplicationReady()
       ++it)
     {
     // Check all Input Parameters
-    if (!this->HasValue(*it) 
-        && IsMandatory(*it) 
+    if (!this->HasValue(*it)
+        && IsMandatory(*it)
         && GetParameterByKey(*it)->GetRoot()->GetActive())
       {
       return false;
diff --git a/Code/Projections/otbImageToGenericRSOutputParameters.h b/Code/Projections/otbImageToGenericRSOutputParameters.h
index d2244cf22f1da7956213f6ad9228738ff1ebc694..670ac795b01b7afc6253792407b404bdf47c65b4 100644
--- a/Code/Projections/otbImageToGenericRSOutputParameters.h
+++ b/Code/Projections/otbImageToGenericRSOutputParameters.h
@@ -100,8 +100,8 @@ public:
   itkGetMacro(OutputSize, SizeType);
 
   /** Isotropic spacing flag */
-  itkSetMacro(EstimateIsotropicSpacing,bool);
-  itkGetMacro(EstimateIsotropicSpacing,bool);
+  itkSetMacro(EstimateIsotropicSpacing, bool);
+  itkGetMacro(EstimateIsotropicSpacing, bool);
   itkBooleanMacro(EstimateIsotropicSpacing);
 
   /**
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.cxx b/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.cxx
index bb7f76744b066109065bd165fecadd49e6d1c01a..f54786e8261f9f2cf977a06a6846d1b5493a4922 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.cxx
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.cxx
@@ -138,7 +138,7 @@ QWidget* QtWidgetView::CreateDoc()
     for (unsigned int i = 0; i < m_Application->GetDocTags().size() - 1; i++)
       {
       oss << m_Application->GetDocTags()[i] << ", ";
-     ;
+    ;
       }
     oss << m_Application->GetDocTags()[m_Application->GetDocTags().size() - 1];
     }
diff --git a/Testing/Code/Common/otbMultiChannelExtractROI.cxx b/Testing/Code/Common/otbMultiChannelExtractROI.cxx
index 0ff185c317df40eefb228807a04699d41c9ffd45..d12af7165f4f53e4fc73ebcab40e33a144a56e17 100644
--- a/Testing/Code/Common/otbMultiChannelExtractROI.cxx
+++ b/Testing/Code/Common/otbMultiChannelExtractROI.cxx
@@ -132,15 +132,15 @@ int generic_otbMultiChannelExtractROI(int argc, char * argv[], const char * inpu
 
   if (computeExtractTime)
   {
-	  chrono.Start();
+         chrono.Start();
   }
 
   writer->Update();
 
   if (computeExtractTime)
   {
-	  chrono.Stop();
-	  std::cout << " Time to compute the extracted image: " << chrono.GetTotal() << " seconds" << std::endl;
+         chrono.Stop();
+         std::cout << " Time to compute the extracted image: " << chrono.GetTotal() << " seconds" << std::endl;
   }
 
   std::cout << " Number of channels in the input image: " << reader->GetOutput()->GetNumberOfComponentsPerPixel() <<