diff --git a/include/nshlib/nshlib.h b/include/nshlib/nshlib.h
index 0029ab2e9..109664956 100644
--- a/include/nshlib/nshlib.h
+++ b/include/nshlib/nshlib.h
@@ -124,7 +124,7 @@ void nsh_initialize(void);
  *   operations to handle the cases where the session is lost when the
  *   USB device is unplugged and restarted when the USB device is plugged
  *   in again.
-  *
+ *
  * Input Parameters:
  *   Standard task start-up arguments.  These are not used.  argc may be
  *   zero and argv may be NULL.
diff --git a/nshlib/nsh_consolemain.c b/nshlib/nsh_consolemain.c
index 3d08122a5..f89944ff6 100644
--- a/nshlib/nsh_consolemain.c
+++ b/nshlib/nsh_consolemain.c
@@ -55,14 +55,14 @@
  * Name: nsh_consolemain (Normal character device version)
  *
  * Description:
- *   This interfaces maybe to called or started with task_start to start a
+ *   This interfaces may be to called or started with task_start to start a
  *   single an NSH instance that operates on stdin and stdout.  This
  *   function does not normally return (see below).
  *
  *   This version of nsh_consolmain handles generic /dev/console character
  *   devices (see nsh_usbconsole.c and usb_usbkeyboard for other versions
  *   for special USB console devices).
-  *
+ *
  * Input Parameters:
  *   Standard task start-up arguments.  These are not used.  argc may be
  *   zero and argv may be NULL.
@@ -79,17 +79,17 @@ int nsh_consolemain(int argc, char *argv[])
   FAR struct console_stdio_s *pstate = nsh_newconsole();
   int ret;
 
-  DEBUGASSERT(pstate);
-
-  /* Execute the start-up script */
+  DEBUGASSERT(pstate != NULL);
 
 #ifdef CONFIG_NSH_ROMFSETC
+  /* Execute the start-up script */
+
   (void)nsh_initscript(&pstate->cn_vtbl);
 #endif
 
+#ifdef CONFIG_NSH_USBDEV_TRACE
   /* Initialize any USB tracing options that were requested */
 
-#ifdef CONFIG_NSH_USBDEV_TRACE
   usbtrace_enable(TRACE_BITSET);
 #endif
 
diff --git a/nshlib/nsh_script.c b/nshlib/nsh_script.c
index 12945ea4a..2c4a369bd 100644
--- a/nshlib/nsh_script.c
+++ b/nshlib/nsh_script.c
@@ -42,31 +42,8 @@
 #include "nsh.h"
 #include "nsh_console.h"
 
-#if  CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !defined(CONFIG_NSH_DISABLESCRIPT)
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
+#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && \
+    !defined(CONFIG_NSH_DISABLESCRIPT)
 
 /****************************************************************************
  * Public Functions
diff --git a/nshlib/nsh_session.c b/nshlib/nsh_session.c
index 9f0e78788..e463368ab 100644
--- a/nshlib/nsh_session.c
+++ b/nshlib/nsh_session.c
@@ -59,12 +59,13 @@
  * Name: nsh_session
  *
  * Description:
- *   This is the common session logic or any NSH session.  This function
- *   return when an error reading from the input stream occurs, presumably
+ *   This is the common session login on any NSH session.  This function
+ *   returns when an error reading from the input stream occurs, presumably
  *   signaling the end of the session.
  *
  *   This function:
- *   - Executes the NSH logic script
+ *   - Performs the login sequence if so configured
+ *   - Executes the NSH login script
  *   - Presents a greeting
  *   - Then provides a prompt then gets and processes the command line.
  *   - This continues until an error occurs, then the session returns.