diff --git a/kernel/microkernel/idle.c b/kernel/microkernel/idle.c
index 12ffe8c4520..fab7c62a750 100644
--- a/kernel/microkernel/idle.c
+++ b/kernel/microkernel/idle.c
@@ -323,7 +323,7 @@ void _sys_power_save_idle(int32_t ticks)
 	if ((ticks == TICKS_UNLIMITED) || ticks >= _sys_idle_threshold_ticks) {
 		/*
 		 * Stop generating system timer interrupts until it's time for
-		 * the next scheduled microkernel timer to expire. 
+		 * the next scheduled microkernel timer to expire.
 		 */
 
 		_timer_idle_enter(ticks);
diff --git a/kernel/nanokernel/nano_fifo.c b/kernel/nanokernel/nano_fifo.c
index 31f6486975a..3eaa1b60f28 100644
--- a/kernel/nanokernel/nano_fifo.c
+++ b/kernel/nanokernel/nano_fifo.c
@@ -32,7 +32,7 @@
 
 /*
 DESCRIPTION
-This module provides the VxMicro nanokernel (aka system-level) 'fifo' 
+This module provides the VxMicro nanokernel (aka system-level) 'fifo'
 implementation. This module provides the backing implementation for the
 following APIs:
 
diff --git a/samples/microkernel/benchmark/app_kernel/src/memcfg.h b/samples/microkernel/benchmark/app_kernel/src/memcfg.h
index 2e458251b5c..7d281f64e8a 100644
--- a/samples/microkernel/benchmark/app_kernel/src/memcfg.h
+++ b/samples/microkernel/benchmark/app_kernel/src/memcfg.h
@@ -33,7 +33,7 @@
 #ifndef MESSAGE_H
 #define MESSAGE_H
 
-#define MESSAGE_SIZE  		8192
-#define MESSAGE_SIZE_PIPE  	4096	/* must be smaller than MESSAGE_SIZE */
+#define MESSAGE_SIZE        8192
+#define MESSAGE_SIZE_PIPE   4096	/* must be smaller than MESSAGE_SIZE */
 
 #endif
diff --git a/samples/microkernel/test/test_secure_string_api/src/secure.c b/samples/microkernel/test/test_secure_string_api/src/secure.c
index ab3d43e6dc9..8c643f5654c 100644
--- a/samples/microkernel/test/test_secure_string_api/src/secure.c
+++ b/samples/microkernel/test/test_secure_string_api/src/secure.c
@@ -70,7 +70,7 @@ void MainTask(void)
 	/* now we check the first task to perform the test and die */
 	result = task_sem_take_wait_timeout(SEMA1, WAIT_TOUT);
 	if (result == RC_TIME) {
-		TC_PRINT("As expected, test task 1 did not continue operating \n");
+		TC_PRINT("As expected, test task 1 did not continue operating\n");
 		TC_PRINT("after calling memcpy_s with incorrect parameters\n");
 	} else {
 		TC_ERROR("Test task 1 unexpectedly continued\n"
@@ -88,7 +88,7 @@ void MainTask(void)
 	/* now we check the second task to perform the test and die */
 	result = task_sem_take_wait_timeout(SEMA2, WAIT_TOUT);
 	if (result == RC_TIME) {
-		TC_PRINT("As expected, test task 2 did not continue operating \n");
+		TC_PRINT("As expected, test task 2 did not continue operating\n");
 		TC_PRINT("after calling strcpy_s with incorrect parameters\n");
 	} else {
 		TC_ERROR("Test task 2 unexpectedly continued\n"
diff --git a/samples/microkernel/test/test_task/src/task.c b/samples/microkernel/test/test_task/src/task.c
index e79291697dd..76319c462ae 100644
--- a/samples/microkernel/test/test_task/src/task.c
+++ b/samples/microkernel/test/test_task/src/task.c
@@ -369,7 +369,7 @@ int taskYieldTest(void)
 		task_yield();
 
 		if (helperData == prevHelperData) {
-			TC_ERROR("Iter %d.  helperData did not change (%d) \n",
+			TC_ERROR("Iter %d.  helperData did not change (%d)\n",
 					 i + 1, helperData);
 			return TC_FAIL;
 		}
diff --git a/samples/nanokernel/test/test_fifo/src/fifo.c b/samples/nanokernel/test/test_fifo/src/fifo.c
index 0017404d73d..2113b1f546e 100644
--- a/samples/nanokernel/test/test_fifo/src/fifo.c
+++ b/samples/nanokernel/test/test_fifo/src/fifo.c
@@ -344,7 +344,7 @@ void testIsrFifoFromFiber(void)
 	}
 
 	/* Put more item into queue */
-	TC_PRINT("\nISR FIFO (running in fiber context) Put Order: \n");
+	TC_PRINT("\nISR FIFO (running in fiber context) Put Order:\n");
 	for (int i=0; i<NUM_FIFO_ELEMENT; i++) {
 		isrFifoInfo.data = pPutList1[i];
 		TC_PRINT(" %p,", pPutList1[i]);
diff --git a/samples/nanokernel/test/test_stack/src/stack.c b/samples/nanokernel/test/test_stack/src/stack.c
index baa59f460aa..b4a1289bbde 100644
--- a/samples/nanokernel/test/test_stack/src/stack.c
+++ b/samples/nanokernel/test/test_stack/src/stack.c
@@ -333,7 +333,7 @@ void testIsrStackFromFiber(void)
 	}
 
 	/* Put more data into STACK */
-	TC_PRINT("ISR STACK (running in fiber context) Push to queue1: \n");
+	TC_PRINT("ISR STACK (running in fiber context) Push to queue1:\n");
 	for (int i=0; i<NUM_STACK_ELEMENT; i++) {
 		isrStackInfo.data = myIsrData[i];
 		TC_PRINT("  %d, ", myIsrData[i]);