diff --git a/src/api/api_msg.c b/src/api/api_msg.c
index 5d250f4d..c50c7972 100644
--- a/src/api/api_msg.c
+++ b/src/api/api_msg.c
@@ -522,7 +522,6 @@ do_disconnect(struct api_msg_msg *msg)
   sys_mbox_post(msg->conn->mbox, NULL);
 }
 
-
 void
 do_listen(struct api_msg_msg *msg)
 {
@@ -604,7 +603,7 @@ do_recv(struct api_msg_msg *msg)
 void
 do_write(struct api_msg_msg *msg)
 {
-#if LWIP_TCP  
+#if LWIP_TCP
   err_t err;
 #endif /* LWIP_TCP */
   if (msg->conn->err == ERR_OK) {
@@ -655,7 +654,7 @@ do_close(struct api_msg_msg *msg)
 #endif /* LWIP_TCP */
   sys_mbox_post(msg->conn->mbox, NULL);
 }
- 
+
 #if LWIP_IGMP
 void
 do_join_leave_group(struct api_msg_msg *msg)
diff --git a/src/include/lwip/api.h b/src/include/lwip/api.h
index 3722c451..aa0d4b00 100644
--- a/src/include/lwip/api.h
+++ b/src/include/lwip/api.h
@@ -132,7 +132,7 @@ void              netbuf_first    (struct netbuf *buf);
 void              netbuf_copy_partial(struct netbuf *buf, void *dataptr, 
               u16_t len, u16_t offset);
 
-#define netbuf_copy(buf,dataptr,len) netbuf_copy_partial(buf, dataptr, len, 0)              
+#define netbuf_copy(buf,dataptr,len) netbuf_copy_partial(buf, dataptr, len, 0)
 #define netbuf_len(buf)              ((buf)->p->tot_len)
 #define netbuf_fromaddr(buf)         ((buf)->addr)
 #define netbuf_fromport(buf)         ((buf)->port)
diff --git a/src/include/lwip/api_msg.h b/src/include/lwip/api_msg.h
index dc19dc69..999f457b 100644
--- a/src/include/lwip/api_msg.h
+++ b/src/include/lwip/api_msg.h
@@ -59,15 +59,14 @@ struct api_msg_msg {
     struct  {
       struct ip_addr *ipaddr;
       u16_t port;
-    } bc;
+    } bc; /* do_newconn, do_bind, do_connect, do_join_leave_group*/
     struct {
       const void *dataptr;
       u16_t len;
       u8_t copy;
-    } w;    
-    sys_mbox_t mbox;
-    u16_t len;
-    u8_t raw_proto;
+    } w; /* do_write */
+    u16_t len; /* do_recv */
+    u8_t raw_proto; /* do_newconn */
   } msg;
 };