diff --git a/rclcpp_action/include/rclcpp_action/server.hpp b/rclcpp_action/include/rclcpp_action/server.hpp
index 6bfe9bc076..2da21d37cb 100644
--- a/rclcpp_action/include/rclcpp_action/server.hpp
+++ b/rclcpp_action/include/rclcpp_action/server.hpp
@@ -291,7 +291,7 @@ class Server : public ServerBase, public std::enable_shared_from_this<Server<ACT
 
   /// Signature of a callback that accepts or rejects goal requests.
   using GoalCallback = std::function<GoalResponse(
-        const GoalID&, std::shared_ptr<const typename ACTION::Goal>)>;
+        const GoalID &, std::shared_ptr<const typename ACTION::Goal>)>;
   /// Signature of a callback that accepts or rejects requests to cancel a goal.
   using CancelCallback = std::function<CancelResponse(std::shared_ptr<ServerGoalHandle<ACTION>>)>;
   /// Signature of a callback that is used to notify when the goal has been accepted.
@@ -395,7 +395,7 @@ class Server : public ServerBase, public std::enable_shared_from_this<Server<ACT
     std::shared_ptr<ServerGoalHandle<ACTION>> goal_handle;
     std::weak_ptr<Server<ACTION>> weak_this = this->shared_from_this();
 
-    std::function<void(const GoalID&, std::shared_ptr<void>)> on_terminal_state =
+    std::function<void(const GoalID &, std::shared_ptr<void>)> on_terminal_state =
       [weak_this](const GoalID & uuid, std::shared_ptr<void> result_message)
       {
         std::shared_ptr<Server<ACTION>> shared_this = weak_this.lock();
@@ -413,7 +413,7 @@ class Server : public ServerBase, public std::enable_shared_from_this<Server<ACT
         shared_this->goal_handles_.erase(uuid);
       };
 
-    std::function<void(const GoalID&)> on_executing =
+    std::function<void(const GoalID &)> on_executing =
       [weak_this](const GoalID & uuid)
       {
         std::shared_ptr<Server<ACTION>> shared_this = weak_this.lock();
diff --git a/rclcpp_action/include/rclcpp_action/server_goal_handle.hpp b/rclcpp_action/include/rclcpp_action/server_goal_handle.hpp
index 97844661a0..a6b446fbb2 100644
--- a/rclcpp_action/include/rclcpp_action/server_goal_handle.hpp
+++ b/rclcpp_action/include/rclcpp_action/server_goal_handle.hpp
@@ -231,8 +231,8 @@ class ServerGoalHandle : public ServerGoalHandleBase
     std::shared_ptr<rcl_action_goal_handle_t> rcl_handle,
     GoalID uuid,
     std::shared_ptr<const typename ACTION::Goal> goal,
-    std::function<void(const GoalID&, std::shared_ptr<void>)> on_terminal_state,
-    std::function<void(const GoalID&)> on_executing,
+    std::function<void(const GoalID &, std::shared_ptr<void>)> on_terminal_state,
+    std::function<void(const GoalID &)> on_executing,
     std::function<void(std::shared_ptr<typename ACTION::Feedback>)> publish_feedback
   )
   : ServerGoalHandleBase(rcl_handle), goal_(goal), uuid_(uuid),
@@ -249,8 +249,8 @@ class ServerGoalHandle : public ServerGoalHandleBase
 
   friend Server<ACTION>;
 
-  std::function<void(const GoalID&, std::shared_ptr<void>)> on_terminal_state_;
-  std::function<void(const GoalID&)> on_executing_;
+  std::function<void(const GoalID &, std::shared_ptr<void>)> on_terminal_state_;
+  std::function<void(const GoalID &)> on_executing_;
   std::function<void(std::shared_ptr<typename ACTION::Feedback>)> publish_feedback_;
 };
 }  // namespace rclcpp_action