diff --git a/controller_manager/include/controller_manager/controller_manager.hpp b/controller_manager/include/controller_manager/controller_manager.hpp
index 1044a25e4e..16347cae70 100644
--- a/controller_manager/include/controller_manager/controller_manager.hpp
+++ b/controller_manager/include/controller_manager/controller_manager.hpp
@@ -389,7 +389,7 @@ class ControllerManager : public rclcpp::Node
     const std::vector<ControllerSpec> & controllers, int strictness,
     const ControllersListIterator controller_it);
 
-  /// A functor to be used in the std::sort method to sort the controllers to be able to
+  /// A method to be used in the std::sort method to sort the controllers to be able to
   /// execute them in a proper order
   /**
    * @brief controller_sorting - A functor that compares the controllers ctrl_a and ctrl_b and then
diff --git a/controller_manager/src/controller_manager.cpp b/controller_manager/src/controller_manager.cpp
index c6325549fb..b388ea836b 100644
--- a/controller_manager/src/controller_manager.cpp
+++ b/controller_manager/src/controller_manager.cpp
@@ -2469,7 +2469,7 @@ bool ControllerManager::controller_sorting(
 
     // If the ctrl_a's state interface is the one exported by the ctrl_b then ctrl_b should be
     // infront of ctrl_a
-    /// @todo deal with the state interface chaining in the sorting algorithm
+    //TODO(saikishor): deal with the state interface chaining in the sorting algorithm
     auto state_it = std::find_if(
       state_itfs.begin(), state_itfs.end(),
       [ctrl_b](auto itf) { return (itf.find(ctrl_b.info.name) != std::string::npos); });