diff --git a/cpu/cortexm_common/include/core_cm0.h b/cpu/cortexm_common/include/core_cm0.h
index cf2b5d66ba2369f802c7e4f67e05dad916b6e21b..a78a2c3f6a865ed20093c0dd409bd7bafc170680 100644
--- a/cpu/cortexm_common/include/core_cm0.h
+++ b/cpu/cortexm_common/include/core_cm0.h
@@ -138,8 +138,8 @@
     #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
   #endif
 
-#elif defined ( __CSMC__ )		/* Cosmic */
-  #if ( __CSMC__ & 0x400)		// FPU present for parser
+#elif defined ( __CSMC__ )      /* Cosmic */
+  #if ( __CSMC__ & 0x400)       /* FPU present for parser */
     #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
   #endif
 #endif
diff --git a/cpu/cortexm_common/include/core_cm0plus.h b/cpu/cortexm_common/include/core_cm0plus.h
index 123cb400a254719c25b913816208b9867924de0f..1677999ccd16a6484a8a8f3a4131ab08e44d6ef0 100644
--- a/cpu/cortexm_common/include/core_cm0plus.h
+++ b/cpu/cortexm_common/include/core_cm0plus.h
@@ -138,8 +138,8 @@
     #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
   #endif
 
-#elif defined ( __CSMC__ )		/* Cosmic */
-  #if ( __CSMC__ & 0x400)		// FPU present for parser
+#elif defined ( __CSMC__ )      /* Cosmic */
+  #if ( __CSMC__ & 0x400)       /* FPU present for parser */
     #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
   #endif
 #endif
diff --git a/cpu/cortexm_common/include/core_cm3.h b/cpu/cortexm_common/include/core_cm3.h
index 092ee23da9f16844e6fece8cf49657797c0b764d..5b0fa193a2a0ea4028c79be2d16f3ed66ae83542 100644
--- a/cpu/cortexm_common/include/core_cm3.h
+++ b/cpu/cortexm_common/include/core_cm3.h
@@ -138,8 +138,8 @@
     #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
   #endif
 
-#elif defined ( __CSMC__ )		/* Cosmic */
-  #if ( __CSMC__ & 0x400)		// FPU present for parser
+#elif defined ( __CSMC__ )      /* Cosmic */
+  #if ( __CSMC__ & 0x400)       /* FPU present for parser */
     #error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
   #endif
 #endif
diff --git a/cpu/cortexm_common/include/core_cm4.h b/cpu/cortexm_common/include/core_cm4.h
index 9749c27d240a9d720ab836442f8da299afd4164c..c15421cf17ec38b242c74b0a047af1d01c333e02 100644
--- a/cpu/cortexm_common/include/core_cm4.h
+++ b/cpu/cortexm_common/include/core_cm4.h
@@ -171,8 +171,8 @@
     #define __FPU_USED         0
   #endif
 
-#elif defined ( __CSMC__ )		/* Cosmic */
-  #if ( __CSMC__ & 0x400)		// FPU present for parser
+#elif defined ( __CSMC__ )      /* Cosmic */
+  #if ( __CSMC__ & 0x400)       /* FPU present for parser */
     #if (__FPU_PRESENT == 1)
       #define __FPU_USED       1
     #else
diff --git a/cpu/cortexm_common/include/core_cm7.h b/cpu/cortexm_common/include/core_cm7.h
index 842e323f675f9dc064ff135226937dd42e1bbcfe..7adb52b94f1da6642608921859b99fbb45fb2eed 100644
--- a/cpu/cortexm_common/include/core_cm7.h
+++ b/cpu/cortexm_common/include/core_cm7.h
@@ -171,8 +171,8 @@
     #define __FPU_USED         0
   #endif
 
-#elif defined ( __CSMC__ )		/* Cosmic */
-  #if ( __CSMC__ & 0x400)		// FPU present for parser
+#elif defined ( __CSMC__ )      /* Cosmic */
+  #if ( __CSMC__ & 0x400)       /* FPU present for parser */
     #if (__FPU_PRESENT == 1)
       #define __FPU_USED       1
     #else
diff --git a/cpu/cortexm_common/include/core_cmFunc.h b/cpu/cortexm_common/include/core_cmFunc.h
index 4eee28b5f3c7b70f874205fb3e8ac241670256a3..c586b3e64adf1ea0beb4021f33470b303642ef64 100644
--- a/cpu/cortexm_common/include/core_cmFunc.h
+++ b/cpu/cortexm_common/include/core_cmFunc.h
@@ -552,7 +552,7 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE void __set_BASEPRI(uint32_t v
 /** \brief  Set Base Priority with condition
 
     This function assigns the given value to the Base Priority register only if BASEPRI masking is disabled,
-	or the new value increases the BASEPRI priority level.
+    or the new value increases the BASEPRI priority level.
 
     \param [in]    basePri  Base Priority value to set
  */