diff --git a/include/sot/core/sot.hh b/include/sot/core/sot.hh
index 34ebbeb6..5efa6ad0 100644
--- a/include/sot/core/sot.hh
+++ b/include/sot/core/sot.hh
@@ -101,8 +101,7 @@ class SOTSOT_CORE_EXPORT Sot : public Entity {
  public:
   /*! \brief Default constructor */
   Sot(const std::string &name);
-  ~Sot(void) { /* TODO!! */
-  }
+  ~Sot(void) { /* TODO!! */ }
 
   /*! \name Methods to handle the stack.
     @{
diff --git a/src/exception/exception-factory.cpp b/src/exception/exception-factory.cpp
index 28720a11..f1152408 100644
--- a/src/exception/exception-factory.cpp
+++ b/src/exception/exception-factory.cpp
@@ -39,17 +39,15 @@ ExceptionFactory::ExceptionFactory(
   char buffer[SIZE];
   vsnprintf(buffer, SIZE, format, args);
 
-  sotDEBUG(15) << "Created "
-               << " with message <" << msg << "> and buffer <" << buffer
-               << ">. " << std::endl;
+  sotDEBUG(15) << "Created " << " with message <" << msg << "> and buffer <"
+               << buffer << ">. " << std::endl;
 
   message += buffer;
 
   va_end(args);
 
   sotDEBUG(1) << "Throw exception " << EXCEPTION_NAME << "[#" << errcode
-              << "]: "
-              << "<" << message << ">." << std::endl;
+              << "]: " << "<" << message << ">." << std::endl;
 }
 
 /*
diff --git a/src/filters/filter-differentiator.cpp b/src/filters/filter-differentiator.cpp
index 687d5735..a139817f 100644
--- a/src/filters/filter-differentiator.cpp
+++ b/src/filters/filter-differentiator.cpp
@@ -97,19 +97,19 @@ void FilterDifferentiator::init(const double &timestep, const size_type &xSize,
   m_filter =
       new CausalFilter(timestep, xSize, filter_numerator, filter_denominator);
 
-  LOG("Filtering started with "
-      << "Numerator " << filter_numerator << std::endl
-      << "Denominator" << filter_denominator << std::endl);
+  LOG("Filtering started with " << "Numerator " << filter_numerator << std::endl
+                                << "Denominator" << filter_denominator
+                                << std::endl);
   return;
 }
 
 void FilterDifferentiator::switch_filter(
     const Eigen::VectorXd &filter_numerator,
     const Eigen::VectorXd &filter_denominator) {
-  LOG("Filter switched with "
-      << "Numerator " << filter_numerator << std::endl
-      << "Denominator" << filter_denominator << std::endl
-      << "at time" << m_xSIN.getTime());
+  LOG("Filter switched with " << "Numerator " << filter_numerator << std::endl
+                              << "Denominator" << filter_denominator
+                              << std::endl
+                              << "at time" << m_xSIN.getTime());
   m_filter->switch_filter(filter_numerator, filter_denominator);
 }
 
diff --git a/src/task/task-conti.cpp b/src/task/task-conti.cpp
index 7e4b569b..f264c854 100644
--- a/src/task/task-conti.cpp
+++ b/src/task/task-conti.cpp
@@ -105,8 +105,7 @@ VectorMultiBound &TaskConti::computeContiDesiredVelocity(
 /* --- DISPLAY ------------------------------------------------------------ */
 
 void TaskConti::display(std::ostream &os) const {
-  os << "TaskConti " << name << " [t=" << timeRef << "] "
-     << ": " << endl;
+  os << "TaskConti " << name << " [t=" << timeRef << "] " << ": " << endl;
   os << "--- LIST ---  " << std::endl;
 
   for (FeatureList_t::const_iterator iter = featureList.begin();
diff --git a/src/tools/robot-utils.cpp b/src/tools/robot-utils.cpp
index 38a64aa8..c4c4c84a 100644
--- a/src/tools/robot-utils.cpp
+++ b/src/tools/robot-utils.cpp
@@ -220,10 +220,9 @@ void ForceUtil::display(std::ostream &os) const {
   os << std::endl;
 
   os << "Index for force sensors:" << std::endl;
-  os << "Left Hand (" << m_Force_Id_Left_Hand << ") ,"
-     << "Right Hand (" << m_Force_Id_Right_Hand << ") ,"
-     << "Left Foot (" << m_Force_Id_Left_Foot << ") ,"
-     << "Right Foot (" << m_Force_Id_Right_Foot << ") " << std::endl;
+  os << "Left Hand (" << m_Force_Id_Left_Hand << ") ," << "Right Hand ("
+     << m_Force_Id_Right_Hand << ") ," << "Left Foot (" << m_Force_Id_Left_Foot
+     << ") ," << "Right Foot (" << m_Force_Id_Right_Foot << ") " << std::endl;
 }
 
 /**************** FromURDFToSot *************************/
diff --git a/tests/sot/test_solverSoth.cpp b/tests/sot/test_solverSoth.cpp
index e83fd769..80dbefe3 100644
--- a/tests/sot/test_solverSoth.cpp
+++ b/tests/sot/test_solverSoth.cpp
@@ -271,13 +271,11 @@ void deparse(std::vector<bubMatrix> Jes, std::vector<bubVector> ees,
         if (boundSide[i] & ConstraintMem::BOUND_INF) {
           for (unsigned int j = 0; j < Ji.size2(); ++j)
             cout << -Ji(i, j) << " ";
-          cout << "\t"
-               << " X " << -eiInf(i) << endl;
+          cout << "\t" << " X " << -eiInf(i) << endl;
         }
         if (boundSide[i] & ConstraintMem::BOUND_SUP) {
           for (unsigned int j = 0; j < Ji.size2(); ++j) cout << Ji(i, j) << " ";
-          cout << "\t"
-               << " X " << eiSup(i) << endl;
+          cout << "\t" << " X " << eiSup(i) << endl;
         }
       }
   }
diff --git a/tests/task/test_flags.cpp b/tests/task/test_flags.cpp
index 5a26781c..0c86b7ec 100644
--- a/tests/task/test_flags.cpp
+++ b/tests/task/test_flags.cpp
@@ -21,32 +21,21 @@ int main(void) {
   cout << "Entering test" << endl;
   Flags f1(128 * 112 + 84);
   Flags f2(198);
-  cout << "f1    "
-       << "\t" << f1 << endl;
-  cout << "f2    "
-       << "\t" << f2 << endl;
+  cout << "f1    " << "\t" << f1 << endl;
+  cout << "f2    " << "\t" << f2 << endl;
 
   cout << endl;
-  cout << "1|2   "
-       << "\t" << (f1 | f2) << endl;
-  cout << "1&2   "
-       << "\t" << (f1 & f2) << endl;
-  cout << "TRUE  "
-       << "\t" << (Flags(true)) << endl;
-  cout << "1&TRUE"
-       << "\t" << (f1 & Flags(true)) << endl;
-  cout << "1&!2 "
-       << "\t" << ((!f2) & f1) << endl;
-  cout << "1XOR2 "
-       << "\t" << (((!f2) & f1) | ((!f1) & f2)) << endl;
+  cout << "1|2   " << "\t" << (f1 | f2) << endl;
+  cout << "1&2   " << "\t" << (f1 & f2) << endl;
+  cout << "TRUE  " << "\t" << (Flags(true)) << endl;
+  cout << "1&TRUE" << "\t" << (f1 & Flags(true)) << endl;
+  cout << "1&!2 " << "\t" << ((!f2) & f1) << endl;
+  cout << "1XOR2 " << "\t" << (((!f2) & f1) | ((!f1) & f2)) << endl;
 
   cout << endl;
-  cout << "f1    "
-       << "\t" << f1 << endl;
-  cout << "!2    "
-       << "\t" << !f2 << endl;
-  cout << "1|!2 "
-       << "\t" << (f1 | (!f2)) << endl;
+  cout << "f1    " << "\t" << f1 << endl;
+  cout << "!2    " << "\t" << !f2 << endl;
+  cout << "1|!2 " << "\t" << (f1 | (!f2)) << endl;
 
   cout << endl;
   if (f1 & f2)
@@ -61,10 +50,8 @@ int main(void) {
   cout << endl;
 
   cout << endl;
-  cout << "f1>>3 "
-       << "\t" << Flags(f1 >> 3) << endl;
-  cout << "f1>>5 "
-       << "\t" << Flags(f1 >> 5) << endl;
+  cout << "f1>>3 " << "\t" << Flags(f1 >> 3) << endl;
+  cout << "f1>>5 " << "\t" << Flags(f1 >> 5) << endl;
 
   cout << "f1 byte per byte:";
   for (int i = 0; i < 16; ++i) {