diff --git a/configs/photon/wlan/defconfig b/configs/photon/wlan/defconfig
index 996eed2273..409aae40fc 100644
--- a/configs/photon/wlan/defconfig
+++ b/configs/photon/wlan/defconfig
@@ -1310,10 +1310,6 @@ CONFIG_HAVE_CXX=y
 # Application Configuration
 #
 
-#
-# NxWidgets/NxWM
-#
-
 #
 # Built-In Applications
 #
@@ -1585,6 +1581,10 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_NSH_CONSOLE_LOGIN is not set
 # CONFIG_NSH_TELNET_LOGIN is not set
 
+#
+# NxWidgets/NxWM
+#
+
 #
 # Platform-specific Support
 #
diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c
index 8788b5ca95..dc911bbf3f 100644
--- a/net/tcp/tcp_input.c
+++ b/net/tcp/tcp_input.c
@@ -194,7 +194,8 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen)
                *  1. The ACK is never received.  This will be handled by
                *     a timeout managed by tcp_timer().
                *  2. The listener "unlistens()".  This will be handled by
-               *     the failure of tcp_accept_connection() when the ACK is received.
+               *     the failure of tcp_accept_connection() when the ACK is
+               *     received.
                */
 
               conn->crefs = 1;
@@ -202,10 +203,11 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen)
 
           if (!conn)
             {
-              /* Either (1) all available connections are in use, or (2) there is no
-               * application in place to accept the connection.  We drop packet and hope that
-               * the remote end will retransmit the packet at a time when we
-               * have more spare connections or someone waiting to accept the connection.
+              /* Either (1) all available connections are in use, or (2)
+               * there is no application in place to accept the connection.
+               * We drop packet and hope that the remote end will retransmit
+               * the packet at a time when we have more spare connections
+               * or someone waiting to accept the connection.
                */
 
 #ifdef CONFIG_NET_STATISTICS
diff --git a/net/tcp/tcp_timer.c b/net/tcp/tcp_timer.c
index 8e21bb5d8f..a9047fc478 100644
--- a/net/tcp/tcp_timer.c
+++ b/net/tcp/tcp_timer.c
@@ -220,7 +220,7 @@ void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
 #endif
               /* Check for a timeout on connection in the TCP_SYN_RCVD state.
                * On such timeouts, we would normally resend the SYNACK until
-               * the ACK is received, completing the 3-way handshek.  But if
+               * the ACK is received, completing the 3-way handshake.  But if
                * the retry count elapsed, then we must assume that no ACK is
                * forthcoming and terminate the attempted connection.
                */
@@ -233,7 +233,7 @@ void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
                   conn->tcpstateflags = TCP_CLOSED;
                   ninfo("TCP state: TCP_CLOSED\n");
 
-                  /* Find the listener for this connectins */
+                  /* Find the listener for this connection. */
 
                   listener = tcp_findlistener(conn->lport);
                   if (listener != NULL)