diff --git a/examples/flowc/flowc_mktestdata.c b/examples/flowc/flowc_mktestdata.c
index ae31cf8513..900c0d7009 100644
--- a/examples/flowc/flowc_mktestdata.c
+++ b/examples/flowc/flowc_mktestdata.c
@@ -35,7 +35,7 @@ int main(int argc, char **envp)
 
   for (i = 0; i < 100; i++)
     {
-      for (ch = 0x20; ch < 0x7F; ch++)
+      for (ch = 0x20; ch < 0x7f; ch++)
         {
           putchar(ch);
         }
diff --git a/examples/nxhello/nxhello_listener.c b/examples/nxhello/nxhello_listener.c
index 06273af84f..7379365237 100644
--- a/examples/nxhello/nxhello_listener.c
+++ b/examples/nxhello/nxhello_listener.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/examples/nxterm/nxhello_listener.c
+ * apps/examples/nxhello/nxhello_listener.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -46,7 +46,7 @@ FAR void *nxhello_listener(FAR void *arg)
 
   /* Process events forever */
 
-  for (;;)
+  for (; ; )
     {
       /* Handle the next event.  If we were configured blocking, then
        * we will stay right here until the next event is received.  Since
diff --git a/examples/system/system_main.c b/examples/system/system_main.c
index 7b48e5bc87..0783dda8c6 100644
--- a/examples/system/system_main.c
+++ b/examples/system/system_main.c
@@ -27,6 +27,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
 /****************************************************************************
  * Name: system_main
  ****************************************************************************/
diff --git a/fsutils/passwd/passwd_append.c b/fsutils/passwd/passwd_append.c
index 32f7a03810..ed8f87a268 100644
--- a/fsutils/passwd/passwd_append.c
+++ b/fsutils/passwd/passwd_append.c
@@ -64,11 +64,11 @@ int passwd_append(FAR const char *username, FAR const char *password)
 
   stream = fopen(CONFIG_FSUTILS_PASSWD_PATH, "a");
   if (stream == NULL)
-   {
+    {
       int errcode = errno;
       DEBUGASSERT(errcode > 0);
       return errcode;
-   }
+    }
 
   /* The format of the password file is:
    *
diff --git a/graphics/ft80x/ft80x_gpio.c b/graphics/ft80x/ft80x_gpio.c
index ca5cfd0997..b040722226 100644
--- a/graphics/ft80x/ft80x_gpio.c
+++ b/graphics/ft80x/ft80x_gpio.c
@@ -94,7 +94,6 @@ int ft80x_gpio_configure(int fd, uint8_t gpio, uint8_t dir, uint8_t drive,
 
   /* Set the pin direction */
 
-
   ret = ft80x_getreg8(fd, FT80X_REG_GPIO_DIR, &regval8);
   if (ret < 0)
     {
diff --git a/graphics/pdcurs34/pdcurses/pdc_keyname.c b/graphics/pdcurs34/pdcurses/pdc_keyname.c
index 15d6d046fb..c5a4921735 100644
--- a/graphics/pdcurs34/pdcurses/pdc_keyname.c
+++ b/graphics/pdcurs34/pdcurses/pdc_keyname.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/graphics/pdcurses/pdc_keyname.c
+ * apps/graphics/pdcurs34/pdcurses/pdc_keyname.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/graphics/pdcurs34/pdcurses/pdc_touch.c b/graphics/pdcurs34/pdcurses/pdc_touch.c
index 3c4a2c7c52..5eda71905e 100644
--- a/graphics/pdcurs34/pdcurses/pdc_touch.c
+++ b/graphics/pdcurs34/pdcurses/pdc_touch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/graphics/pdcurses/pdc_touch.c
+ * apps/graphics/pdcurs34/pdcurses/pdc_touch.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/modbus/functions/mbfuncdiag.c b/modbus/functions/mbfuncdiag.c
index ded0ca4883..a6ee8fa685 100644
--- a/modbus/functions/mbfuncdiag.c
+++ b/modbus/functions/mbfuncdiag.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/functions/mbfuncdiag.c
+ * apps/modbus/functions/mbfuncdiag.c
  *
  * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
  * Copyright (c) 2006 Christian Walter <wolti@sil.at>
@@ -28,3 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/