diff --git a/src/g2_2025_grade_calculator_pkg/src/retake_grade_determinator/nodes/RetakeGradeDeterminator.cpp b/src/g2_2025_grade_calculator_pkg/src/retake_grade_determinator/nodes/RetakeGradeDeterminator.cpp
index ed25319..2d05669 100644
--- a/src/g2_2025_grade_calculator_pkg/src/retake_grade_determinator/nodes/RetakeGradeDeterminator.cpp
+++ b/src/g2_2025_grade_calculator_pkg/src/retake_grade_determinator/nodes/RetakeGradeDeterminator.cpp
@@ -139,7 +139,7 @@ rclcpp_action::CancelResponse RetakeGradeDeterminator::cancel_callback(
 
 void RetakeGradeDeterminator::spawn_callback_thread(
     const std::shared_ptr<rclcpp_action::ServerGoalHandle<g2_2025_interfaces::action::Retake>> goal_handle
-) {
+) { // Spawn a new thread to prevent blocking the executor
     std::thread{std::bind(&RetakeGradeDeterminator::async_execute_callback_thread, this, std::placeholders::_1), goal_handle}.detach();
 }
 
diff --git a/src/g2_2025_grade_calculator_pkg/src/retake_scheduler/nodes/RetakeScheduler.cpp b/src/g2_2025_grade_calculator_pkg/src/retake_scheduler/nodes/RetakeScheduler.cpp
index 8d9d528..e7ffc90 100644
--- a/src/g2_2025_grade_calculator_pkg/src/retake_scheduler/nodes/RetakeScheduler.cpp
+++ b/src/g2_2025_grade_calculator_pkg/src/retake_scheduler/nodes/RetakeScheduler.cpp
@@ -3,8 +3,8 @@
 namespace assignments::one::retake_scheduler {
 
 RetakeScheduler::RetakeScheduler(std::unique_ptr<DatabaseManager> db_manager) : Node("retake_scheduler") {
-    this->declare_parameter("retake_check_interval", 120); // Default to 120 seconds
-    retake_check_interval_ = this->get_parameter("retake_check_interval").as_int();
+    this->declare_parameter("retake_check_interval_sec", 120); // Default to 120 seconds
+    retake_check_interval_ = this->get_parameter("retake_check_interval_sec").as_int();
 
     // Make db_manager optional for testing purposes
     if (db_manager) {