diff --git a/lib/imap.js b/lib/imap.js
index 050b93c..132d6f0 100644
--- a/lib/imap.js
+++ b/lib/imap.js
@@ -358,10 +358,9 @@ ImapConnection.prototype.connect = function(loginCb) {
         self.debug&&self.debug('[parsing incoming] saw untagged ' + m.type);
         switch (m.type) {
           case 'NAMESPACE':
-            /* m.personal = personal namespaces (or null)
-               m.other = personal namespaces (or null)
-               m.shared = personal namespaces (or null)
-             */
+            // m.personal = personal namespaces (or null)
+            // m.other = personal namespaces (or null)
+            // m.shared = personal namespaces (or null)
             self.namespaces.personal =
                   parsers.parseNamespaces(m.personal, indata.literals);
             self.namespaces.other =
@@ -383,10 +382,9 @@ ImapConnection.prototype.connect = function(loginCb) {
           case 'LIST':
           case 'LSUB':
           case 'XLIST':
-            /* m.flags = list of 0+ flags
-               m.delimiter = mailbox delimiter (string or null)
-               m.mailbox = mailbox name (string)
-             */
+            // m.flags = list of 0+ flags
+            // m.delimiter = mailbox delimiter (string or null)
+            // m.mailbox = mailbox name (string)
             m.flags = (m.flags ? m.flags.toUpperCase().split(' ') : []);
             m.delimiter = parsers.convStr(m.delimiter, indata.literals);
             m.mailbox = parsers.convStr(m.mailbox, indata.literals);
@@ -432,9 +430,8 @@ ImapConnection.prototype.connect = function(loginCb) {
             requests[0].cbargs.push((m.results ? m.results.split(' ') : []));
             break;
           case 'STATUS':
-            /* m.mailbox = mailbox name (string)
-               m.attributes = expression list (k=>v pairs) of mailbox attributes
-             */
+            // m.mailbox = mailbox name (string)
+            // m.attributes = expression list (k=>v pairs) of mailbox attributes
             m.mailbox = parsers.convStr(m.mailbox, indata.literals);
             var ret = {
               name: m.mailbox,
@@ -473,9 +470,8 @@ ImapConnection.prototype.connect = function(loginCb) {
             self.capabilities = m.capabilities.toUpperCase().split(' ');
             break;
           case 'BYE':
-            /* m.code = resp-text-code
-               m.message = arbitrary message
-             */
+            // m.code = resp-text-code
+            // m.message = arbitrary message
             state.conn.end();
             break;
         }
@@ -1231,7 +1227,7 @@ ImapConnection.prototype._move = function(which, uids, boxTo, cb) {
   }
 };
 
-/* Namespace for seqno-based commands */
+// Namespace for seqno-based commands
 ImapConnection.prototype.__defineGetter__('seq', function() {
   var self = this;
   return {
@@ -1275,8 +1271,7 @@ ImapConnection.prototype.__defineGetter__('seq', function() {
 });
 
 
-/****** Private Functions ******/
-
+// Private/Internal Functions
 ImapConnection.prototype._fnTmrConn = function(loginCb) {
   loginCb(new Error('Connection timed out'));
   this._state.conn.destroy();