diff --git a/include/dynamic-graph/python/dynamic-graph-py.hh b/include/dynamic-graph/python/dynamic-graph-py.hh
index 51c2810f11e123b40deebe4129031b0181b7e074..1a36c343ca004977fc3fb5b508bac13c780a6b13 100644
--- a/include/dynamic-graph/python/dynamic-graph-py.hh
+++ b/include/dynamic-graph/python/dynamic-graph-py.hh
@@ -41,7 +41,7 @@ void exposeSignals();
 // Declare functions defined in other source files
 namespace signalBase {
 SignalBase<sigtime_t>* createSignalWrapper(const char* name, const char* type,
-                                     bp::object object);
+                                           bp::object object);
 }  // namespace signalBase
 namespace entity {
 
diff --git a/src/dynamic_graph/dynamic-graph-py.cc b/src/dynamic_graph/dynamic-graph-py.cc
index 5946ffade4dc239f5dc14b6e408b9e2610d7468d..dda53ac46660d81fc71533cccf6257ef4e007a0f 100644
--- a/src/dynamic_graph/dynamic-graph-py.cc
+++ b/src/dynamic_graph/dynamic-graph-py.cc
@@ -66,8 +66,8 @@ MapOfEntities* getEntityMap() {
       &dg::PoolStorage::getInstance()->getEntityMap());
 }
 
-dg::SignalBase<dg::sigtime_t>* getSignal(dg::Entity& e, const std::string& name)
-{
+dg::SignalBase<dg::sigtime_t>* getSignal(dg::Entity& e,
+                                         const std::string& name) {
   return &e.getSignal(name);
 }
 
diff --git a/src/dynamic_graph/signal-base-py.cc b/src/dynamic_graph/signal-base-py.cc
index 7214b047fad3115bfe57dd1f21063ff1590a105c..eedb36711ce56afa2a632d85406e20e56193ae77 100644
--- a/src/dynamic_graph/signal-base-py.cc
+++ b/src/dynamic_graph/signal-base-py.cc
@@ -130,8 +130,9 @@ void exposeSignals() {
 namespace signalBase {
 
 template <class T>
-SignalWrapper<T, sigtime_t>* createSignalWrapperTpl(const char* name, bp::object o,
-                                              std::string& error) {
+SignalWrapper<T, sigtime_t>* createSignalWrapperTpl(const char* name,
+                                                    bp::object o,
+                                                    std::string& error) {
   typedef SignalWrapper<T, sigtime_t> SignalWrapper_t;
   if (!SignalWrapper_t::checkCallable(o, error)) {
     return NULL;
@@ -155,39 +156,35 @@ PythonSignalContainer* getPythonSignalContainer() {
    \brief Create an instance of SignalWrapper
 */
 SignalBase<sigtime_t>* createSignalWrapper(const char* name, const char* type,
-                                     bp::object object) {
+                                           bp::object object) {
   PythonSignalContainer* psc = getPythonSignalContainer();
   if (psc == NULL) return NULL;
 
   SignalBase<sigtime_t>* obj = NULL;
   std::string error;
-  if(command::Value::typeName(command::Value::BOOL).compare(type) == 0) {
+  if (command::Value::typeName(command::Value::BOOL).compare(type) == 0) {
     obj = createSignalWrapperTpl<bool>(name, object, error);
-  }
-  else if(command::Value::typeName(command::Value::UNSIGNED).compare(type) ==
-          0) {
+  } else if (command::Value::typeName(command::Value::UNSIGNED).compare(type) ==
+             0) {
     obj = createSignalWrapperTpl<unsigned int>(name, object, error);
-  }
-  else if(command::Value::typeName(command::Value::INT).compare(type) == 0) {
+  } else if (command::Value::typeName(command::Value::INT).compare(type) == 0) {
     obj = createSignalWrapperTpl<int>(name, object, error);
-  }
-  else if(command::Value::typeName(command::Value::UNSIGNEDLONGINT).
-          compare(type) == 0){
+  } else if (command::Value::typeName(command::Value::UNSIGNEDLONGINT)
+                 .compare(type) == 0) {
     obj = createSignalWrapperTpl<uint64_t>(name, object, error);
-  }
-  else if(command::Value::typeName(command::Value::LONGINT).compare(type) == 0){
+  } else if (command::Value::typeName(command::Value::LONGINT).compare(type) ==
+             0) {
     obj = createSignalWrapperTpl<int64_t>(name, object, error);
-  }
-  else if(command::Value::typeName(command::Value::FLOAT).compare(type) == 0){
+  } else if (command::Value::typeName(command::Value::FLOAT).compare(type) ==
+             0) {
     obj = createSignalWrapperTpl<float>(name, object, error);
-  }
-  else if(command::Value::typeName(command::Value::DOUBLE).compare(type) == 0){
+  } else if (command::Value::typeName(command::Value::DOUBLE).compare(type) ==
+             0) {
     obj = createSignalWrapperTpl<double>(name, object, error);
-  }
-  else if(command::Value::typeName(command::Value::VECTOR).compare(type) == 0){
+  } else if (command::Value::typeName(command::Value::VECTOR).compare(type) ==
+             0) {
     obj = createSignalWrapperTpl<Vector>(name, object, error);
-  }
-  else {
+  } else {
     error = "Type not understood";
   }