diff --git a/src/signal/signal-cast-helper.cpp b/src/signal/signal-cast-helper.cpp
index 633ab5f58fe09a8ee0f962a758e3424ab4bb3fb4..2fc210022cd890c99b0ed7b9b0d0117c663e0daa 100644
--- a/src/signal/signal-cast-helper.cpp
+++ b/src/signal/signal-cast-helper.cpp
@@ -76,18 +76,16 @@ void DefaultCastRegisterer<dynamicgraph::Matrix>::trace(
 // for std::string, do not check failure. If input stream contains an
 // empty string, iss.fail() returns true and an exception is thrown
 template <>
-inline boost::any DefaultCastRegisterer<std::string>::cast
-(std::istringstream &iss)
-{
-  std::string inst (iss.str ());
+inline boost::any
+DefaultCastRegisterer<std::string>::cast(std::istringstream &iss) {
+  std::string inst(iss.str());
   return inst;
 }
 
 // for std::string, do not add std::endl at the end of the stream.
 template <>
-inline void DefaultCastRegisterer<std::string>::disp
-(const boost::any &object, std::ostream &os)
-{
+inline void DefaultCastRegisterer<std::string>::disp(const boost::any &object,
+                                                     std::ostream &os) {
   os << boost::any_cast<std::string>(object);
 }
 
diff --git a/tests/signal-ptr.cpp b/tests/signal-ptr.cpp
index a2fc5b5c67ff53b981b899898834b5b272b364a2..30be26826fb9b66f7a02d4be15ce868d3581fcce 100644
--- a/tests/signal-ptr.cpp
+++ b/tests/signal-ptr.cpp
@@ -87,26 +87,25 @@ BOOST_AUTO_TEST_CASE(normal_test) {
   cout << std::endl;
 }
 
-BOOST_AUTO_TEST_CASE (plug_signal_string)
-{
+BOOST_AUTO_TEST_CASE(plug_signal_string) {
   Signal<std::string, int> outSig("output");
-  SignalPtr<std::string, int> inSig (NULL, "input");
+  SignalPtr<std::string, int> inSig(NULL, "input");
 
-  std::string str ("two words");
+  std::string str("two words");
   outSig.setConstant(str);
-  inSig.plug (&outSig);
+  inSig.plug(&outSig);
   inSig.recompute(1);
   std::ostringstream os1;
-  inSig.get (os1);
-  std::string res (os1.str ());
-  BOOST_CHECK (res == str);
+  inSig.get(os1);
+  std::string res(os1.str());
+  BOOST_CHECK(res == str);
 
-  Signal<std::string, int> s ("signal");
+  Signal<std::string, int> s("signal");
   std::ostringstream os2;
-  s.setConstant (str);
-  os2.clear ();
-  s.get (os2);
-  res = os2.str ();
+  s.setConstant(str);
+  os2.clear();
+  s.get(os2);
+  res = os2.str();
   std::cout << "res=" << res << std::endl;
-  BOOST_CHECK (res == str);
+  BOOST_CHECK(res == str);
 }