diff --git a/src/shared/scheduler/TaskScheduler.cpp b/src/shared/scheduler/TaskScheduler.cpp
index 844fea5e9377f5a358e34f64b33bc403122d3eb3..b92b9a642068a71972f74fcae85364d438a2fabe 100644
--- a/src/shared/scheduler/TaskScheduler.cpp
+++ b/src/shared/scheduler/TaskScheduler.cpp
@@ -153,7 +153,7 @@ void TaskScheduler::normalizeTasks()
     int64_t currentTick = getTick();
 
     EventQueue newAgenda;
-    while (agenda.size() > 0)
+    while (!agenda.empty())
     {
         Event event = agenda.top();
         agenda.pop();
@@ -168,7 +168,7 @@ void TaskScheduler::normalizeTasks()
 
         newAgenda.push(event);
     }
-    agenda = newAgenda;
+    agenda = std::move(newAgenda);
 }
 
 void TaskScheduler::run()
@@ -177,7 +177,7 @@ void TaskScheduler::run()
 
     while (true)
     {
-        while (agenda.size() == 0 && !shouldStop())
+        while (agenda.empty() && !shouldStop())
             condvar.wait(mutex);
 
         // Exit if the ActiveObject has been stopped