diff --git a/include/sta/tacos/configs/default.hpp b/include/sta/tacos/configs/default.hpp
index 8f479c3..119c247 100644
--- a/include/sta/tacos/configs/default.hpp
+++ b/include/sta/tacos/configs/default.hpp
@@ -12,4 +12,4 @@
 // Per default, we assume state 0 to be the initial state.
 #define STA_TACOS_INITIAL_STATE             0
 
-#endif // STA_TACOS_CONFIGS_DEFAULT_HPP
\ No newline at end of file
+#endif // STA_TACOS_CONFIGS_DEFAULT_HPP
diff --git a/include/sta/tacos/thread.hpp b/include/sta/tacos/thread.hpp
index b17b396..391bfdf 100644
--- a/include/sta/tacos/thread.hpp
+++ b/include/sta/tacos/thread.hpp
@@ -137,7 +137,14 @@ namespace sta
 			virtual void cleanup();
 
 #ifdef STA_TACOS_WATCHDOG_ENABLED
-		#define BLOCKING(stmt) waiting(); stmt heartbeat()
+		/**
+		 * @brief This macro wraps a given statement into waiting() and heartbeat() to make the code more readable.
+		 * 
+		 */
+		#define blocking(...) \
+			waiting(); \
+			__VA_ARGS__ \
+			heartbeat(); \
 
 		protected:
 			/**
diff --git a/src/thread.cpp b/src/thread.cpp
index 72cfe10..0cef749 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -25,7 +25,7 @@ namespace sta
 				  attribs_{ .name=name, .cb_size=cb_size, .stack_size=stack_size, .priority=prio },
 				  running_{false},
 #ifdef STA_TACOS_WATCHDOG_ENABLED
-				  status_{ThreadStatus::STOPPED}
+				  , status_{ThreadStatus::STOPPED}
 #endif // STA_TACOS_WATCHDOG_ENABLED
 		{
 			STA_ASSERT(stack_size >= 0);
@@ -36,9 +36,9 @@ namespace sta
 				: RtosThread(RtosHandle<osThreadId_t>(Handle::Deferred(&instance_))),
 				  instance_{ NULL },
 				  attribs_{ },
-				  running_{false},
+				  running_{false}
 #ifdef STA_TACOS_WATCHDOG_ENABLED
-				  status_{ThreadStatus::STOPPED}
+				  , status_{ThreadStatus::STOPPED}
 #endif // STA_TACOS_WATCHDOG_ENABLED
 		{}