diff --git a/rclcpp/include/rclcpp/node_interfaces/node_base.hpp b/rclcpp/include/rclcpp/node_interfaces/node_base.hpp
index 0e124f6f56..4386ee5e55 100644
--- a/rclcpp/include/rclcpp/node_interfaces/node_base.hpp
+++ b/rclcpp/include/rclcpp/node_interfaces/node_base.hpp
@@ -50,82 +50,66 @@ class NodeBase : public NodeBaseInterface
   ~NodeBase();
 
   RCLCPP_PUBLIC
-
   const char *
   get_name() const override;
 
   RCLCPP_PUBLIC
-
   const char *
   get_namespace() const override;
 
   RCLCPP_PUBLIC
-
   const char *
   get_fully_qualified_name() const override;
 
   RCLCPP_PUBLIC
-
   rclcpp::Context::SharedPtr
   get_context() override;
 
   RCLCPP_PUBLIC
-
   rcl_node_t *
   get_rcl_node_handle() override;
 
   RCLCPP_PUBLIC
-
   const rcl_node_t *
   get_rcl_node_handle() const override;
 
   RCLCPP_PUBLIC
-
   std::shared_ptr<rcl_node_t>
   get_shared_rcl_node_handle() override;
 
   RCLCPP_PUBLIC
-
   std::shared_ptr<const rcl_node_t>
   get_shared_rcl_node_handle() const override;
 
   RCLCPP_PUBLIC
-
   rclcpp::CallbackGroup::SharedPtr
   create_callback_group(rclcpp::CallbackGroupType group_type) override;
 
   RCLCPP_PUBLIC
-
   rclcpp::CallbackGroup::SharedPtr
   get_default_callback_group() override;
 
   RCLCPP_PUBLIC
-
   bool
   callback_group_in_node(rclcpp::CallbackGroup::SharedPtr group) override;
 
   RCLCPP_PUBLIC
-
   const std::vector<rclcpp::CallbackGroup::WeakPtr> &
   get_callback_groups() const override;
 
   RCLCPP_PUBLIC
-
   std::atomic_bool &
   get_associated_with_executor_atomic() override;
 
   RCLCPP_PUBLIC
-
   rcl_guard_condition_t *
   get_notify_guard_condition() override;
 
   RCLCPP_PUBLIC
-
   std::unique_lock<std::recursive_mutex>
   acquire_notify_guard_condition_lock() const override;
 
   RCLCPP_PUBLIC
-
   bool
   get_use_intra_process_default() const override;
 
diff --git a/rclcpp/include/rclcpp/node_interfaces/node_graph.hpp b/rclcpp/include/rclcpp/node_interfaces/node_graph.hpp
index 26d91aecfd..5882c727af 100644
--- a/rclcpp/include/rclcpp/node_interfaces/node_graph.hpp
+++ b/rclcpp/include/rclcpp/node_interfaces/node_graph.hpp
@@ -57,64 +57,52 @@ class NodeGraph : public NodeGraphInterface
   ~NodeGraph();
 
   RCLCPP_PUBLIC
-
   std::map<std::string, std::vector<std::string>>
   get_topic_names_and_types(bool no_demangle = false) const override;
 
   RCLCPP_PUBLIC
-
   std::map<std::string, std::vector<std::string>>
   get_service_names_and_types() const override;
 
   RCLCPP_PUBLIC
-
   std::vector<std::string>
   get_node_names() const override;
 
   RCLCPP_PUBLIC
-
   std::vector<std::pair<std::string, std::string>>
   get_node_names_and_namespaces() const override;
 
   RCLCPP_PUBLIC
-
   size_t
   count_publishers(const std::string & topic_name) const override;
 
   RCLCPP_PUBLIC
-
   size_t
   count_subscribers(const std::string & topic_name) const override;
 
   RCLCPP_PUBLIC
-
   const rcl_guard_condition_t *
   get_graph_guard_condition() const override;
 
   RCLCPP_PUBLIC
-
   void
   notify_graph_change() override;
 
   RCLCPP_PUBLIC
-
   void
   notify_shutdown() override;
 
   RCLCPP_PUBLIC
-
   rclcpp::Event::SharedPtr
   get_graph_event() override;
 
   RCLCPP_PUBLIC
-
   void
   wait_for_graph_change(
     rclcpp::Event::SharedPtr event,
     std::chrono::nanoseconds timeout) override;
 
   RCLCPP_PUBLIC
-
   size_t
   count_graph_users() override;
 
diff --git a/rclcpp/include/rclcpp/node_interfaces/node_logging.hpp b/rclcpp/include/rclcpp/node_interfaces/node_logging.hpp
index 17f835b0dd..ea91064be7 100644
--- a/rclcpp/include/rclcpp/node_interfaces/node_logging.hpp
+++ b/rclcpp/include/rclcpp/node_interfaces/node_logging.hpp
@@ -42,12 +42,10 @@ class NodeLogging : public NodeLoggingInterface
   ~NodeLogging();
 
   RCLCPP_PUBLIC
-
   rclcpp::Logger
   get_logger() const override;
 
   RCLCPP_PUBLIC
-
   const char *
   get_logger_name() const override;
 
diff --git a/rclcpp/include/rclcpp/node_interfaces/node_services.hpp b/rclcpp/include/rclcpp/node_interfaces/node_services.hpp
index 01c9912344..1eecf69eee 100644
--- a/rclcpp/include/rclcpp/node_interfaces/node_services.hpp
+++ b/rclcpp/include/rclcpp/node_interfaces/node_services.hpp
@@ -42,14 +42,12 @@ class NodeServices : public NodeServicesInterface
   ~NodeServices();
 
   RCLCPP_PUBLIC
-
   void
   add_client(
     rclcpp::ClientBase::SharedPtr client_base_ptr,
     rclcpp::CallbackGroup::SharedPtr group) override;
 
   RCLCPP_PUBLIC
-
   void
   add_service(
     rclcpp::ServiceBase::SharedPtr service_base_ptr,
diff --git a/rclcpp/include/rclcpp/node_interfaces/node_timers.hpp b/rclcpp/include/rclcpp/node_interfaces/node_timers.hpp
index 03f151ff25..9f26721d4b 100644
--- a/rclcpp/include/rclcpp/node_interfaces/node_timers.hpp
+++ b/rclcpp/include/rclcpp/node_interfaces/node_timers.hpp
@@ -42,7 +42,6 @@ class NodeTimers : public NodeTimersInterface
 
   /// Add a timer to the node.
   RCLCPP_PUBLIC
-
   void
   add_timer(
     rclcpp::TimerBase::SharedPtr timer,
diff --git a/rclcpp/include/rclcpp/node_interfaces/node_waitables.hpp b/rclcpp/include/rclcpp/node_interfaces/node_waitables.hpp
index fd560bca48..46c24d9aa1 100644
--- a/rclcpp/include/rclcpp/node_interfaces/node_waitables.hpp
+++ b/rclcpp/include/rclcpp/node_interfaces/node_waitables.hpp
@@ -41,14 +41,12 @@ class NodeWaitables : public NodeWaitablesInterface
   ~NodeWaitables();
 
   RCLCPP_PUBLIC
-
   void
   add_waitable(
     rclcpp::Waitable::SharedPtr waitable_base_ptr,
     rclcpp::CallbackGroup::SharedPtr group) override;
 
   RCLCPP_PUBLIC
-
   void
   remove_waitable(
     rclcpp::Waitable::SharedPtr waitable_ptr,