diff --git a/base/thread_pool_computational.hpp b/base/thread_pool_computational.hpp
index 66788c9979..027a163d0f 100644
--- a/base/thread_pool_computational.hpp
+++ b/base/thread_pool_computational.hpp
@@ -86,7 +86,8 @@ public:
 
   // Stop a ThreadPool.
   // Removes the tasks that are not yet started from the queue.
-  // This function will not block until all runnables have been completed.
+  // Unlike the destructor, this function does not wait for all runnables to complete:
+  // the tasks will stop as soon as possible.
   void Stop()
   {
     {
diff --git a/base/thread_pool_delayed.hpp b/base/thread_pool_delayed.hpp
index bd5bc481c7..7cdc11d22f 100644
--- a/base/thread_pool_delayed.hpp
+++ b/base/thread_pool_delayed.hpp
@@ -18,7 +18,7 @@ namespace thread_pool
 {
 namespace delayed
 {
-// This class represents a simple worker thread with a queue of tasks.
+// This class represents a simple thread pool with a queue of tasks.
 //
 // *NOTE* This class IS NOT thread-safe, it must be destroyed on the
 // same thread it was created, but Push* methods are thread-safe.
diff --git a/base/thread_utils.hpp b/base/thread_utils.hpp
index 69ac2c7cd9..342aab43b0 100644
--- a/base/thread_utils.hpp
+++ b/base/thread_utils.hpp
@@ -28,7 +28,7 @@ private:
   ThreadContainer & m_threads;
 };
 
-// This class is needed in ThreadPool to store std::packaged_task<> objects.
+// This class can be used in thread pools to store std::packaged_task<> objects.
 // std::packaged_task<> isn’t copyable so we have to use std::move().
 // This idea is borrowed from the book C++ Concurrency in action by Anthony Williams (Chapter 9).
 class FunctionWrapper