diff --git a/examples/poll/Kconfig b/examples/poll/Kconfig
index 0b4b1d296..5d26f9bb6 100644
--- a/examples/poll/Kconfig
+++ b/examples/poll/Kconfig
@@ -28,4 +28,4 @@ config EXAMPLES_POLL_NETMASK
 	hex "Network Mask"
 	default 0xffffff00
 
-endif
+endif # EXAMPLES_POLL
diff --git a/examples/poll/net_listener.c b/examples/poll/net_listener.c
index 2164c112c..f1bda2e72 100644
--- a/examples/poll/net_listener.c
+++ b/examples/poll/net_listener.c
@@ -63,7 +63,7 @@
 #include "poll_internal.h"
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 #define IOBUFFER_SIZE 80
@@ -298,7 +298,7 @@ static void net_configure(void)
   uint8_t mac[IFHWADDRLEN];
 #endif
 
-  /* Configure uIP */
+  /* Configure the network */
   /* Many embedded network interfaces must have a software assigned MAC */
 
 #ifdef CONFIG_EXAMPLES_POLL_NOMAC
@@ -343,7 +343,7 @@ void *net_listener(pthread_addr_t pvarg)
   int ret;
   int i;
 
-  /* Configure uIP */
+  /* Configure the network */
 
   net_configure();
 
diff --git a/examples/poll/net_reader.c b/examples/poll/net_reader.c
index 082ce1b41..dedba5634 100644
--- a/examples/poll/net_reader.c
+++ b/examples/poll/net_reader.c
@@ -63,7 +63,7 @@
 #include "poll_internal.h"
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 #define IOBUFFER_SIZE 80
@@ -91,7 +91,7 @@ static void net_configure(void)
   uint8_t mac[IFHWADDRLEN];
 #endif
 
-  /* Configure uIP */
+  /* Configure the network */
   /* Many embedded network interfaces must have a software assigned MAC */
 
 #ifdef CONFIG_EXAMPLES_POLL_NOMAC
@@ -232,7 +232,7 @@ void *net_reader(pthread_addr_t pvarg)
   socklen_t addrlen;
   int optval;
 
-  /* Configure uIP */
+  /* Configure the network */
 
   net_configure();
 
@@ -288,6 +288,7 @@ void *net_reader(pthread_addr_t pvarg)
           printf("net_reader: accept failure: %d\n", errno);
           continue;
         }
+
       printf("net_reader: Connection accepted on sd=%d\n", acceptsd);
 
       /* Configure to "linger" until all data is sent when the socket is closed */
@@ -295,11 +296,12 @@ void *net_reader(pthread_addr_t pvarg)
 #ifdef POLL_HAVE_SOLINGER
       ling.l_onoff  = 1;
       ling.l_linger = 30;     /* timeout is seconds */
+
       if (setsockopt(acceptsd, SOL_SOCKET, SO_LINGER, &ling, sizeof(struct linger)) < 0)
         {
-        printf("net_reader: setsockopt SO_LINGER failure: %d\n", errno);
-        goto errout_with_acceptsd;
-      }
+          printf("net_reader: setsockopt SO_LINGER failure: %d\n", errno);
+          goto errout_with_acceptsd;
+        }
 #endif
 
       /* Handle incoming messsages on the connection. */
diff --git a/examples/poll/poll_internal.h b/examples/poll/poll_internal.h
index 534a6e2ec..7d8c3ecee 100644
--- a/examples/poll/poll_internal.h
+++ b/examples/poll/poll_internal.h
@@ -47,7 +47,7 @@
 #include <pthread.h>
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 #ifdef CONFIG_DISABLE_POLL
diff --git a/examples/poll/poll_listener.c b/examples/poll/poll_listener.c
index ca1b1542d..901a017c4 100644
--- a/examples/poll/poll_listener.c
+++ b/examples/poll/poll_listener.c
@@ -56,7 +56,7 @@
 #include "poll_internal.h"
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 #if defined(CONFIG_DEV_CONSOLE) && !defined(CONFIG_DEV_LOWCONSOLE)
@@ -105,6 +105,7 @@ void *poll_listener(pthread_addr_t pvarg)
   /* Open the FIFO for non-blocking read */
 
   printf("poll_listener: Opening %s for non-blocking read\n", FIFO_PATH1);
+
   fd = open(FIFO_PATH1, O_RDONLY|O_NONBLOCK);
   if (fd < 0)
     {
diff --git a/examples/poll/poll_main.c b/examples/poll/poll_main.c
index 0f61f2f25..6fb166afd 100644
--- a/examples/poll/poll_main.c
+++ b/examples/poll/poll_main.c
@@ -54,7 +54,7 @@
 #include "poll_internal.h"
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/examples/poll/select_listener.c b/examples/poll/select_listener.c
index 8a8023f9f..d3933bbeb 100644
--- a/examples/poll/select_listener.c
+++ b/examples/poll/select_listener.c
@@ -55,7 +55,7 @@
 #include "poll_internal.h"
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /****************************************************************************