Index: src/libcfa/concurrency/monitor
===================================================================
--- src/libcfa/concurrency/monitor	(revision 8fc45b762b4e8374629230668423504c051c14e7)
+++ src/libcfa/concurrency/monitor	(revision 513daecfd75605c6a42d821f2b9893c3f2cb260c)
@@ -39,8 +39,4 @@
 }
 
-// static inline int ?<?(monitor_desc* lhs, monitor_desc* rhs) {
-// 	return ((intptr_t)lhs) < ((intptr_t)rhs);
-// }
-
 struct monitor_guard_t {
 	monitor_desc ** m;
@@ -74,16 +70,34 @@
 
 struct __condition_criterion_t {
-	bool ready;						//Whether or not the criterion is met (True if met)
-	monitor_desc * target;				//The monitor this criterion concerns
-	struct __condition_node_t * owner;		//The parent node to which this criterion belongs
-	__condition_criterion_t * next;		//Intrusive linked list Next field
+	// Whether or not the criterion is met (True if met)
+	bool ready;
+
+	// The monitor this criterion concerns
+	monitor_desc * target;
+
+	// The parent node to which this criterion belongs
+	struct __condition_node_t * owner;
+
+	// Intrusive linked list Next field
+	__condition_criterion_t * next;
+
 };
 
 struct __condition_node_t {
-	thread_desc * waiting_thread;			//Thread that needs to be woken when all criteria are met
-	__condition_criterion_t * criteria; 	//Array of criteria (Criterions are contiguous in memory)
-	unsigned short count;				//Number of criterions in the criteria
-	__condition_node_t * next;			//Intrusive linked list Next field
-	uintptr_t user_info;				//Custom user info accessible before signalling
+	// Thread that needs to be woken when all criteria are met
+	thread_desc * waiting_thread;
+
+	// Array of criteria (Criterions are contiguous in memory)
+	__condition_criterion_t * criteria;
+
+	// Number of criterions in the criteria
+	unsigned short count;
+
+	// Intrusive linked list Next field
+	__condition_node_t * next;
+
+	// Custom user info accessible before signalling
+	uintptr_t user_info;
+
 };
 
@@ -102,7 +116,13 @@
 
 struct condition {
-	__condition_blocked_queue_t blocked;	//Link list which contains the blocked threads as-well as the information needed to unblock them
-	monitor_desc ** monitors;			//Array of monitor pointers (Monitors are NOT contiguous in memory)
-	unsigned short monitor_count;			//Number of monitors in the array
+	// Link list which contains the blocked threads as-well as the information needed to unblock them
+	__condition_blocked_queue_t blocked;
+
+	// Array of monitor pointers (Monitors are NOT contiguous in memory)
+	monitor_desc ** monitors;
+
+	// Number of monitors in the array
+	unsigned short monitor_count;
+
 };