diff --git a/arch/arm/src/stm32wb/stm32wb_blehci.c b/arch/arm/src/stm32wb/stm32wb_blehci.c
index 74b3483bd0..f5f7630db2 100644
--- a/arch/arm/src/stm32wb/stm32wb_blehci.c
+++ b/arch/arm/src/stm32wb/stm32wb_blehci.c
@@ -128,7 +128,7 @@ static struct bt_driver_s g_blehci_driver =
   .send         = stm32wb_blehci_driversend
 };
 
-static mutex_t  g_lock = NXMUTEX_INITIALIZER;
+static mutex_t g_lock = NXMUTEX_INITIALIZER;
 struct work_s g_drv_init_work;
 
 /****************************************************************************
diff --git a/binfmt/elf.c b/binfmt/elf.c
index 8896e35b27..02bb603a7c 100644
--- a/binfmt/elf.c
+++ b/binfmt/elf.c
@@ -262,8 +262,8 @@ static int elf_loadbinary(FAR struct binary_s *binp,
     {
       if (nexports > 0)
         {
-          berr("Cannot bind exported symbols to a "\
-                                    "fully linked executable\n");
+          berr("Cannot bind exported symbols to a "
+               "fully linked executable\n");
           ret = -ENOEXEC;
           goto errout_with_load;
         }
@@ -275,8 +275,8 @@ static int elf_loadbinary(FAR struct binary_s *binp,
 
   else
     {
-        berr("Unexpected elf type %d\n", loadinfo.ehdr.e_type);
-        ret = -ENOEXEC;
+      berr("Unexpected elf type %d\n", loadinfo.ehdr.e_type);
+      ret = -ENOEXEC;
     }
 
   /* Return the load information */
diff --git a/binfmt/libelf/libelf_verify.c b/binfmt/libelf/libelf_verify.c
index 09217d49ea..adc8e67bbf 100644
--- a/binfmt/libelf/libelf_verify.c
+++ b/binfmt/libelf/libelf_verify.c
@@ -41,7 +41,7 @@
 
 static const char g_elfmagic[EI_MAGIC_SIZE] =
 {
-    0x7f, 'E', 'L', 'F'
+  0x7f, 'E', 'L', 'F'
 };
 
 /****************************************************************************
@@ -92,7 +92,7 @@ int elf_verifyheader(FAR const Elf_Ehdr *ehdr)
   if ((ehdr->e_type != ET_REL) && (ehdr->e_type != ET_EXEC))
     {
       berr("Not a relocatable or executable file: e_type=%d\n",
-                                        ehdr->e_type);
+           ehdr->e_type);
       return -EINVAL;
     }
 
diff --git a/net/ipfrag/ipfrag.c b/net/ipfrag/ipfrag.c
index 3374a750a9..47f69942bd 100644
--- a/net/ipfrag/ipfrag.c
+++ b/net/ipfrag/ipfrag.c
@@ -108,27 +108,27 @@ do  \
  * if so, free all resources of this node.
  */
 
-static struct wdog_s  g_wdfragtimeout;
+static struct wdog_s g_wdfragtimeout;
 
 /* Reassembly timeout work */
 
-static struct work_s  g_wkfragtimeout;
+static struct work_s g_wkfragtimeout;
 
 /* Remember the number of I/O buffers currently in reassembly cache */
 
-static uint8_t        g_bufoccupy;
+static uint8_t       g_bufoccupy;
 
 /* Queue header definition, it links all fragments of all NICs by ascending
  * ipid.
  */
 
-static sq_queue_t     g_assemblyhead_ipid;
+static sq_queue_t    g_assemblyhead_ipid;
 
 /* Queue header definition, which connects all fragments of all NICs in order
  * of addition time.
  */
 
-static sq_queue_t     g_assemblyhead_time;
+static sq_queue_t    g_assemblyhead_time;
 
 /****************************************************************************
  * Public Data
@@ -138,7 +138,7 @@ static sq_queue_t     g_assemblyhead_time;
  * at a time.
  */
 
-mutex_t               g_ipfrag_lock = NXMUTEX_INITIALIZER;
+mutex_t              g_ipfrag_lock = NXMUTEX_INITIALIZER;
 
 /****************************************************************************
  * Private Function Prototypes
diff --git a/net/ipfrag/ipfrag.h b/net/ipfrag/ipfrag.h
index 15ce7a00c5..9e41c6b27c 100644
--- a/net/ipfrag/ipfrag.h
+++ b/net/ipfrag/ipfrag.h
@@ -151,7 +151,7 @@ extern "C"
  * at a time
  */
 
-extern mutex_t               g_ipfrag_lock;
+extern mutex_t g_ipfrag_lock;
 
 /****************************************************************************
  * Public Function Prototypes
diff --git a/sched/signal/sig_queue.c b/sched/signal/sig_queue.c
index 5f0d920e9a..6b9651806c 100644
--- a/sched/signal/sig_queue.c
+++ b/sched/signal/sig_queue.c
@@ -74,7 +74,7 @@
  *
  ****************************************************************************/
 
-int nxsig_queue (int pid, int signo, union sigval value)
+int nxsig_queue(int pid, int signo, union sigval value)
 {
 #ifdef CONFIG_SCHED_HAVE_PARENT
   FAR struct tcb_s *rtcb = this_task();
@@ -143,7 +143,7 @@ int nxsig_queue (int pid, int signo, union sigval value)
  *
  ****************************************************************************/
 
-int sigqueue (int pid, int signo, union sigval value)
+int sigqueue(int pid, int signo, union sigval value)
 {
   int ret;