diff --git a/include/stack_macros.h b/include/stack_macros.h
index 41490a24b..9b481241b 100644
--- a/include/stack_macros.h
+++ b/include/stack_macros.h
@@ -68,8 +68,8 @@
 
     #if ( configNUMBER_OF_CORES == 1 )
 
-    /* Only the current stack state is to be checked. */
-    #define taskCHECK_FOR_STACK_OVERFLOW()                                                      \
+/* Only the current stack state is to be checked. */
+        #define taskCHECK_FOR_STACK_OVERFLOW()                                                  \
     do                                                                                          \
     {                                                                                           \
         /* Is the currently saved stack pointer within the stack limit? */                      \
@@ -80,10 +80,10 @@
         }                                                                                       \
     } while( 0 )
 
-    #else  /* if ( configNUMBER_OF_CORES == 1 ) */
+    #else /* if ( configNUMBER_OF_CORES == 1 ) */
 
-    /* Only the current stack state is to be checked. */
-    #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID )                                      \
+/* Only the current stack state is to be checked. */
+        #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID )                                  \
     do                                                                                   \
     {                                                                                    \
         const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ];                            \
@@ -105,8 +105,8 @@
 
     #if ( configNUMBER_OF_CORES == 1 )
 
-    /* Only the current stack state is to be checked. */
-    #define taskCHECK_FOR_STACK_OVERFLOW()                                                       \
+/* Only the current stack state is to be checked. */
+        #define taskCHECK_FOR_STACK_OVERFLOW()                                                   \
     do                                                                                           \
     {                                                                                            \
         /* Is the currently saved stack pointer within the stack limit? */                       \
@@ -117,10 +117,10 @@
         }                                                                                        \
     } while( 0 )
 
-    #else  /* if ( configNUMBER_OF_CORES == 1 ) */
+    #else /* if ( configNUMBER_OF_CORES == 1 ) */
 
-    /* Only the current stack state is to be checked. */
-    #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID )                                      \
+/* Only the current stack state is to be checked. */
+        #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID )                                  \
     do                                                                                   \
     {                                                                                    \
         const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ];                            \
@@ -142,7 +142,7 @@
 
     #if ( configNUMBER_OF_CORES == 1 )
 
-    #define taskCHECK_FOR_STACK_OVERFLOW()                                                       \
+        #define taskCHECK_FOR_STACK_OVERFLOW()                                                   \
     do                                                                                           \
     {                                                                                            \
         const uint32_t * const pulStack = ( uint32_t * ) pxCurrentTCB->pxStack;                  \
@@ -159,9 +159,9 @@
         }                                                                                        \
     } while( 0 )
 
-    #else  /* if ( configNUMBER_OF_CORES == 1 ) */
+    #else /* if ( configNUMBER_OF_CORES == 1 ) */
 
-    #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID )                                      \
+        #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID )                                  \
     do                                                                                   \
     {                                                                                    \
         const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ];                            \
@@ -188,7 +188,7 @@
 
     #if ( configNUMBER_OF_CORES == 1 )
 
-    #define taskCHECK_FOR_STACK_OVERFLOW()                                                                                                \
+        #define taskCHECK_FOR_STACK_OVERFLOW()                                                                                            \
     do                                                                                                                                    \
     {                                                                                                                                     \
         int8_t * pcEndOfStack = ( int8_t * ) pxCurrentTCB->pxEndOfStack;                                                                  \
@@ -208,9 +208,9 @@
         }                                                                                                                                 \
     } while( 0 )
 
-    #else  /* if ( configNUMBER_OF_CORES == 1 ) */
+    #else /* if ( configNUMBER_OF_CORES == 1 ) */
 
-    #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID )                                                                                       \
+        #define taskCHECK_FOR_STACK_OVERFLOW( xCoreID )                                                                                   \
     do                                                                                                                                    \
     {                                                                                                                                     \
         const TCB_t * const pxTCB = pxCurrentTCBs[ xCoreID ];                                                                             \