Index: kernel/generic/src/adt/hash_table.c
===================================================================
--- kernel/generic/src/adt/hash_table.c	(revision 583c2a3d5f5f8c120323f09f1d4e2d68b95c8ef2)
+++ kernel/generic/src/adt/hash_table.c	(revision 02fe42eab26cc91005346883f5d0a8462d0ef248)
@@ -331,5 +331,5 @@
 }
 
-/** Removes an item already present in the table. The item must be in the table.*/
+/** Removes an item already present in the table. The item must be in the table. */
 void hash_table_remove_item(hash_table_t *h, ht_link_t *item)
 {
@@ -393,5 +393,5 @@
 }
 
-/** Allocates and initializes the desired number of buckets. True if successful.*/
+/** Allocates and initializes the desired number of buckets. True if successful. */
 static bool alloc_table(size_t bucket_cnt, list_t **pbuckets)
 {
Index: kernel/generic/src/mm/as.c
===================================================================
--- kernel/generic/src/mm/as.c	(revision 583c2a3d5f5f8c120323f09f1d4e2d68b95c8ef2)
+++ kernel/generic/src/mm/as.c	(revision 02fe42eab26cc91005346883f5d0a8462d0ef248)
@@ -2057,5 +2057,5 @@
 	/* Check if A is adjacent to the new interval */
 	adj_a = (a != NULL) && (a->page + P2SZ(a->count) == page);
-	/* Check if the new interval is adjacent to B*/
+	/* Check if the new interval is adjacent to B */
 	adj_b = (b != NULL) && page + P2SZ(count) == b->page;
 
Index: kernel/generic/src/mm/frame.c
===================================================================
--- kernel/generic/src/mm/frame.c	(revision 583c2a3d5f5f8c120323f09f1d4e2d68b95c8ef2)
+++ kernel/generic/src/mm/frame.c	(revision 02fe42eab26cc91005346883f5d0a8462d0ef248)
@@ -85,7 +85,7 @@
 }
 
-/*******************/
-/* Zones functions */
-/*******************/
+/*
+ * Zones functions
+ */
 
 /** Insert-sort zone into zones list.
@@ -341,7 +341,7 @@
 }
 
-/******************/
-/* Zone functions */
-/******************/
+/*
+ * Zone functions
+ */
 
 /** Return frame from zone. */
@@ -781,7 +781,7 @@
 }
 
-/*******************/
-/* Frame functions */
-/*******************/
+/*
+ * Frame functions
+ */
 
 /** Set parent of frame. */
Index: kernel/generic/src/mm/slab.c
===================================================================
--- kernel/generic/src/mm/slab.c	(revision 583c2a3d5f5f8c120323f09f1d4e2d68b95c8ef2)
+++ kernel/generic/src/mm/slab.c	(revision 02fe42eab26cc91005346883f5d0a8462d0ef248)
@@ -151,7 +151,7 @@
 #endif
 
-/**************************************/
-/* Slab allocation functions          */
-/**************************************/
+/*
+ * Slab allocation functions
+ */
 
 /** Allocate frames for slab space and initialize
@@ -223,7 +223,7 @@
 }
 
-/******************/
-/* Slab functions */
-/******************/
+/*
+ * Slab functions
+ */
 
 /** Return object to slab and call a destructor
@@ -323,7 +323,7 @@
 }
 
-/****************************/
-/* CPU-Cache slab functions */
-/****************************/
+/*
+ * CPU-Cache slab functions
+ */
 
 /** Find a full magazine in cache, take it from list and return it
@@ -531,7 +531,7 @@
 }
 
-/************************/
-/* Slab cache functions */
-/************************/
+/*
+ * Slab cache functions
+ */
 
 /** Return number of objects that fit in certain cache size
Index: kernel/generic/src/udebug/udebug_ops.c
===================================================================
--- kernel/generic/src/udebug/udebug_ops.c	(revision 583c2a3d5f5f8c120323f09f1d4e2d68b95c8ef2)
+++ kernel/generic/src/udebug/udebug_ops.c	(revision 02fe42eab26cc91005346883f5d0a8462d0ef248)
@@ -123,5 +123,5 @@
 	/* Now verify that the thread belongs to the current task. */
 	if (thread->task != TASK) {
-		/* No such thread belonging this task*/
+		/* No such thread belonging this task */
 		mutex_unlock(&TASK->udebug.lock);
 		return ENOENT;