Index: kernel/generic/src/udebug/udebug.c
===================================================================
--- kernel/generic/src/udebug/udebug.c	(revision 19021131a8049e328f4ae00e41f505a00c88463b)
+++ kernel/generic/src/udebug/udebug.c	(revision ae5aa909215804fae89d778dde33d31ad6dbdcaa)
@@ -272,5 +272,5 @@
 	}
 
-	//printf("udebug_syscall_event\n");
+	/* Fill in the GO response. */
 	call = THREAD->udebug.go_call;
 	THREAD->udebug.go_call = NULL;
@@ -280,5 +280,4 @@
 	IPC_SET_ARG2(call->data, id);
 	IPC_SET_ARG3(call->data, rc);
-	//printf("udebug_syscall_event/ipc_answer\n");
 
 	THREAD->udebug.syscall_args[0] = a1;
@@ -330,12 +329,11 @@
 	thread_attach(t, ta);
 
-	LOG("udebug_thread_b_event\n");
-	LOG("- check state\n");
+	LOG("Check state");
 
 	/* Must only generate events when in debugging session */
 	if (THREAD->udebug.active != true) {
-		LOG("- udebug.active: %s, udebug.go: %s\n",
-			THREAD->udebug.active ? "yes(+)" : "no(-)",
-			THREAD->udebug.go ? "yes(-)" : "no(+)");
+		LOG("udebug.active: %s, udebug.go: %s",
+			THREAD->udebug.active ? "Yes(+)" : "No",
+			THREAD->udebug.go ? "Yes(-)" : "No");
 		mutex_unlock(&THREAD->udebug.lock);
 		mutex_unlock(&TASK->udebug.lock);
@@ -343,6 +341,5 @@
 	}
 
-	LOG("- trigger event\n");
-
+	LOG("Trigger event");
 	call = THREAD->udebug.go_call;
 	THREAD->udebug.go_call = NULL;
@@ -364,5 +361,5 @@
 	mutex_unlock(&TASK->udebug.lock);
 
-	LOG("- sleep\n");
+	LOG("Wait for Go");
 	udebug_wait_for_go(&THREAD->udebug.go_wq);
 }
@@ -380,12 +377,11 @@
 	mutex_lock(&THREAD->udebug.lock);
 
-	LOG("udebug_thread_e_event\n");
-	LOG("- check state\n");
+	LOG("Check state");
 
 	/* Must only generate events when in debugging session. */
 	if (THREAD->udebug.active != true) {
-/*		printf("- udebug.active: %s, udebug.go: %s\n",
-			THREAD->udebug.active ? "yes(+)" : "no(-)",
-			THREAD->udebug.go ? "yes(-)" : "no(+)");*/
+		LOG("udebug.active: %s, udebug.go: %s",
+			THREAD->udebug.active ? "Yes" : "No",
+			THREAD->udebug.go ? "Yes" : "No");
 		mutex_unlock(&THREAD->udebug.lock);
 		mutex_unlock(&TASK->udebug.lock);
@@ -393,6 +389,5 @@
 	}
 
-	LOG("- trigger event\n");
-
+	LOG("Trigger event");
 	call = THREAD->udebug.go_call;
 	THREAD->udebug.go_call = NULL;
@@ -433,12 +428,10 @@
 	ipl_t ipl;
 
-	LOG("udebug_task_cleanup()\n");
-	LOG("task %" PRIu64 "\n", ta->taskid);
-
 	if (ta->udebug.dt_state != UDEBUG_TS_BEGINNING &&
 	    ta->udebug.dt_state != UDEBUG_TS_ACTIVE) {
-		LOG("udebug_task_cleanup(): task not being debugged\n");
 		return EINVAL;
 	}
+
+	LOG("Task %" PRIu64, ta->taskid);
 
 	/* Finish debugging of all userspace threads */
@@ -471,5 +464,5 @@
 
 				/* Answer GO call */
-				LOG("answer GO call with EVENT_FINISHED\n");
+				LOG("Answer GO call with EVENT_FINISHED.");
 				IPC_SET_RETVAL(t->udebug.go_call->data, 0);
 				IPC_SET_ARG1(t->udebug.go_call->data,
Index: kernel/generic/src/udebug/udebug_ops.c
===================================================================
--- kernel/generic/src/udebug/udebug_ops.c	(revision 19021131a8049e328f4ae00e41f505a00c88463b)
+++ kernel/generic/src/udebug/udebug_ops.c	(revision ae5aa909215804fae89d778dde33d31ad6dbdcaa)
@@ -182,13 +182,9 @@
 	link_t *cur;
 
-	LOG("udebug_begin()\n");
-
-	mutex_lock(&TASK->udebug.lock);
-	LOG("debugging task %llu\n", TASK->taskid);
+	LOG("Debugging task %llu", TASK->taskid);
+	mutex_lock(&TASK->udebug.lock);
 
 	if (TASK->udebug.dt_state != UDEBUG_TS_INACTIVE) {
 		mutex_unlock(&TASK->udebug.lock);
-		LOG("udebug_begin(): busy error\n");
-
 		return EBUSY;
 	}
@@ -218,8 +214,4 @@
 
 	mutex_unlock(&TASK->udebug.lock);
-
-	LOG("udebug_begin() done (%s)\n", 
-	    reply ? "reply" : "stoppability wait");
-
 	return reply;
 }
@@ -234,11 +226,8 @@
 	int rc;
 
-	LOG("udebug_end()\n");
-
-	mutex_lock(&TASK->udebug.lock);
-	LOG("task %" PRIu64 "\n", TASK->taskid);
-
+	LOG("Task %" PRIu64, TASK->taskid);
+
+	mutex_lock(&TASK->udebug.lock);
 	rc = udebug_task_cleanup(TASK);
-
 	mutex_unlock(&TASK->udebug.lock);
 
@@ -255,5 +244,5 @@
 int udebug_set_evmask(udebug_evmask_t mask)
 {
-	LOG("udebug_set_mask()\n");
+	LOG("mask = 0x%x", mask);
 
 	mutex_lock(&TASK->udebug.lock);
@@ -261,11 +250,8 @@
 	if (TASK->udebug.dt_state != UDEBUG_TS_ACTIVE) {
 		mutex_unlock(&TASK->udebug.lock);
-		LOG("udebug_set_mask(): not active debuging session\n");
-
 		return EINVAL;
 	}
 
 	TASK->udebug.evmask = mask;
-
 	mutex_unlock(&TASK->udebug.lock);
 
@@ -318,5 +304,5 @@
 	int rc;
 
-	LOG("udebug_stop()\n");
+	LOG("udebug_stop()");
 
 	/*
@@ -341,5 +327,4 @@
 	 * Answer GO call.
 	 */
-	LOG("udebug_stop - answering go call\n");
 
 	/* Make sure nobody takes this call away from us. */
@@ -349,5 +334,4 @@
 	IPC_SET_RETVAL(call->data, 0);
 	IPC_SET_ARG1(call->data, UDEBUG_EVENT_STOP);
-	LOG("udebug_stop/ipc_answer\n");
 
 	THREAD->udebug.cur_event = UDEBUG_EVENT_STOP;
@@ -359,5 +343,4 @@
 	mutex_unlock(&TASK->udebug.lock);
 
-	LOG("udebog_stop/done\n");
 	return 0;
 }
@@ -393,5 +376,5 @@
 	size_t max_ids;
 
-	LOG("udebug_thread_read()\n");
+	LOG("udebug_thread_read()");
 
 	/* Allocate a buffer to hold thread IDs */