diff --git a/rclcpp/include/rclcpp/node.hpp b/rclcpp/include/rclcpp/node.hpp
index 1e6c9da..7459598 100644
--- a/rclcpp/include/rclcpp/node.hpp
+++ b/rclcpp/include/rclcpp/node.hpp
@@ -59,7 +59,7 @@ namespace node
  * but unfortunately std::function's constructor on VS2015 is too greedy,
  * so we need a mechanism for checking the arity and the type of each argument
  * in a callback function.
-*/
+ */
 template<typename FunctionT>
 struct function_traits
 {
@@ -251,19 +251,19 @@ private:
       >::value
     >::type * = nullptr
 /*
-  TODO(esteve): reenable this block of code when VS2015 gets better support
-  for SFINAE and remove the static_assert from the body of this method. For
-  more info about the current support for SFINAE in VS2015 RC:
+   TODO(esteve): reenable this block of code when VS2015 gets better support
+   for SFINAE and remove the static_assert from the body of this method. For
+   more info about the current support for SFINAE in VS2015 RC:
 
-  http://blogs.msdn.com/b/vcblog/archive/2015/04/29/c-11-14-17-features-in-vs-2015-rc.aspx
-  ,
+   http://blogs.msdn.com/b/vcblog/archive/2015/04/29/c-11-14-17-features-in-vs-2015-rc.aspx
+   ,
     typename std::enable_if<
       std::is_same<
         typename function_traits<FunctorT>::template argument_type<2>,
         typename std::shared_ptr<typename ServiceT::Response>
       >::value
     >::type * = nullptr
-*/
+ */
   >
   typename rclcpp::service::Service<ServiceT>::SharedPtr
   create_service_internal(