diff --git a/rclcpp/include/rclcpp/executor.hpp b/rclcpp/include/rclcpp/executor.hpp
index 4a99f58..1b6afe4 100644
--- a/rclcpp/include/rclcpp/executor.hpp
+++ b/rclcpp/include/rclcpp/executor.hpp
@@ -149,9 +149,8 @@ protected:
     if (taken) {
       subscription->handle_message(message);
     } else {
-      std::cout << "[rclcpp::error] take failed for subscription on topic: "
-                << subscription->get_topic_name()
-                << std::endl;
+      std::cout << "[rclcpp::error] take failed for subscription on topic: " <<
+        subscription->get_topic_name() << std::endl;
     }
   }
 
@@ -177,9 +176,8 @@ protected:
     if (taken) {
       service->handle_request(request_header, request);
     } else {
-      std::cout << "[rclcpp::error] take failed for service on service: "
-                << service->get_service_name()
-                << std::endl;
+      std::cout << "[rclcpp::error] take failed for service on service: " <<
+        service->get_service_name() << std::endl;
     }
   }
 
diff --git a/rclcpp/include/rclcpp/macros.hpp b/rclcpp/include/rclcpp/macros.hpp
index d06b8d5..b76e74f 100644
--- a/rclcpp/include/rclcpp/macros.hpp
+++ b/rclcpp/include/rclcpp/macros.hpp
@@ -30,7 +30,7 @@
  */
 #define RCLCPP_MAKE_SHARED_DEFINITIONS(Class) \
   typedef std::shared_ptr<Class> SharedPtr; \
-  \
+ \
   template<typename ... Args> \
   static std::shared_ptr<Class> \
   make_shared(Args && ... args) \
diff --git a/rclcpp/include/rclcpp/node.hpp b/rclcpp/include/rclcpp/node.hpp
index 3661176..508efdc 100644
--- a/rclcpp/include/rclcpp/node.hpp
+++ b/rclcpp/include/rclcpp/node.hpp
@@ -195,20 +195,20 @@ private:
     typename FunctorT,
     typename std::enable_if<
       function_traits<FunctorT>::arity == 2
-      >::type * = nullptr,
+    >::type * = nullptr,
     typename std::enable_if<
       std::is_same<
         typename function_traits<FunctorT>::template argument_type<0>,
         typename std::shared_ptr<typename ServiceT::Request>
-        >::value
-      >::type * = nullptr,
+      >::value
+    >::type * = nullptr,
     typename std::enable_if<
       std::is_same<
         typename function_traits<FunctorT>::template argument_type<1>,
         typename std::shared_ptr<typename ServiceT::Response>
-        >::value
-      >::type * = nullptr
-    >
+      >::value
+    >::type * = nullptr
+  >
   typename rclcpp::service::Service<ServiceT>::SharedPtr
   create_service_internal(
     rmw_service_t * service_handle,
@@ -226,26 +226,26 @@ private:
     typename FunctorT,
     typename std::enable_if<
       function_traits<FunctorT>::arity == 3
-      >::type * = nullptr,
+    >::type * = nullptr,
     typename std::enable_if<
       std::is_same<
         typename function_traits<FunctorT>::template argument_type<0>,
         std::shared_ptr<rmw_request_id_t>
-        >::value
-      >::type * = nullptr,
+      >::value
+    >::type * = nullptr,
     typename std::enable_if<
       std::is_same<
         typename function_traits<FunctorT>::template argument_type<1>,
         typename std::shared_ptr<typename ServiceT::Request>
-        >::value
-      >::type * = nullptr,
+      >::value
+    >::type * = nullptr,
     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
-    >
+      >::value
+    >::type * = nullptr
+  >
   typename rclcpp::service::Service<ServiceT>::SharedPtr
   create_service_internal(
     rmw_service_t * service_handle,
diff --git a/rclcpp/include/rclcpp/parameter_client.hpp b/rclcpp/include/rclcpp/parameter_client.hpp
index 69aa99c..7e4d086 100644
--- a/rclcpp/include/rclcpp/parameter_client.hpp
+++ b/rclcpp/include/rclcpp/parameter_client.hpp
@@ -99,7 +99,7 @@ public:
             callback(future_result);
           }
         }
-      );
+    );
 
     return future_result;
   }
@@ -129,7 +129,7 @@ public:
             callback(future_result);
           }
         }
-      );
+    );
 
     return future_result;
   }
@@ -158,7 +158,7 @@ public:
             callback(future_result);
           }
         }
-      );
+    );
 
     return future_result;
   }
@@ -187,7 +187,7 @@ public:
             callback(future_result);
           }
         }
-      );
+    );
 
     return future_result;
   }
@@ -215,7 +215,7 @@ public:
             callback(future_result);
           }
         }
-      );
+    );
 
     return future_result;
   }