diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8adc14795e..94de82b09b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-23 02:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbnetio/utils/netiosrv.prg
+  * contrib/hbnetio/utils/netiocmd.prg
+    % Optimizations to latest patch (using FOR EACH).
+    * Formatting and indenting to latest patch.
+
 2010-01-22 17:10 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbxbp/xbpdataref.prg
     % Formatting.
@@ -34,11 +40,11 @@
 
          oDlg:showModal()
 
-         nEvent := 0 
-         DO WHILE ! lExit .AND. ! lOk .AND. nEvent <> xbeP_Close 
-            nEvent := AppEvent( @mp1, @mp2, @oXbp ) 
-            oXbp:handleEvent( nEvent, mp1, mp2 ) 
-         ENDDO 
+         nEvent := 0
+         DO WHILE ! lExit .AND. ! lOk .AND. nEvent <> xbeP_Close
+            nEvent := AppEvent( @mp1, @mp2, @oXbp )
+            oXbp:handleEvent( nEvent, mp1, mp2 )
+         ENDDO
 
          oSle1:getdata()   //// DOESN'T WORK
          oSle2:getdata()   //// GIVES ME DATA OF FIRST SLE !!!!
@@ -46,7 +52,7 @@
 
          oDlg:Destroy()   //RECURSIVE RUNTIME ERROR !!
          //oDlg:hide()
-    
+
        NOTE: See how a little interest of you have fixed many artifacts !!!
 
 2010-01-23 01:30 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
@@ -57,21 +63,21 @@
 2010-01-22 15:07 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbide/ideprojmanager.prg
     % Changed the behavior of placement of project components.
-        1  If <Working Directory> is empty 
+        1  If <Working Directory> is empty
               <Working Directory> == <Project Location>
            .hbp will be placed in <Working Directory> as
               <Working Directory>/<Output Name>.hbp
-           .hbp will include 
+           .hbp will include
               -workdir=<Working Directory>/${hb_plat}/${hb_compl}
 
         2. If <Destination Folder> is empty
              <Destination Folder> == <Project Location>
-           .hbp will include 
+           .hbp will include
               -o<Destination Folder>/<Output Name>
 
         This has facilitated to build projects from any location.
         < Example follows on the mailing-list taking Angel Pais's
-          recent sent hbXBP based small application which bears 
+          recent sent hbXBP based small application which bears
           the 99% Xbase++ code >
 
 2010-01-22 23:46 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
diff --git a/harbour/contrib/hbnetio/utils/netiocmd.prg b/harbour/contrib/hbnetio/utils/netiocmd.prg
index 02b56c7e7c..773290965b 100644
--- a/harbour/contrib/hbnetio/utils/netiocmd.prg
+++ b/harbour/contrib/hbnetio/utils/netiocmd.prg
@@ -27,7 +27,7 @@ FUNCTION hbnetiosrv_LoadCmds( bQuit, bShowInfo )
                "config"    => { "Show server configuration."    , bShowInfo },;
                "sysinfo"   => { "Show system/build information.", {|| cmdSysInfo() } },;
                "quit"      => { "Stop server and exit."         , bQuit },;
-               "help"      => { "Display this help."            ,  {|| cmdHelp( hCmds ) } };
+               "help"      => { "Display this help."            , {|| cmdHelp( hCmds ) } };
             }
 
    RETURN hCmds
@@ -52,17 +52,16 @@ STATIC PROCEDURE cmdSysInfo()
 
 STATIC PROCEDURE cmdHelp( hCommands )
    LOCAL aTexts := {}
-   LOCAL n, k, v, c, m := 0
+   LOCAL n, c, m
 
+   m := 0
    hb_HEval( hCommands, {| k | m := Max( m, Len( k ) ) } )
 
    AAdd( aTexts, "Commands:" )
 
    /* Processing commands */
-   FOR n := 1 TO Len( hCommands )
-       k := hb_hKeyAt( hCommands, n )
-       v := hb_HValueAt( hCommands, n )
-       AAdd( aTexts, " " + PadR( k, m ) + " - " + v[ 1 ] )
+   FOR EACH n IN hCommands
+      AAdd( aTexts, " " + PadR( n:__enumKey(), m ) + " - " + n[ 1 ] )
    NEXT
 
    ASort( aTexts, 2 )
@@ -77,17 +76,17 @@ STATIC PROCEDURE cmdHelp( hCommands )
    c := 0
    m := MaxRow()
 
-   FOR n := 1 TO Len( aTexts )
-       QQOut( aTexts[ n ], hb_osNewLine() )
+   FOR EACH n IN aTexts
+      QQOut( n, hb_osNewLine() )
 
-       IF ++c == m
-          c := 0
-          QQOut( "Press any key to continue..." )
-          Inkey( 0 )
+      IF ++c == m
+         c := 0
+         QQOut( "Press any key to continue..." )
+         Inkey( 0 )
 
-          Scroll( Row(), 0, Row(), MaxCol(), 0 )
-          SetPos( Row(), 0 )
-       ENDIF
+         Scroll( Row(), 0, Row(), MaxCol(), 0 )
+         SetPos( Row(), 0 )
+      ENDIF
    NEXT
 
    RETURN
diff --git a/harbour/contrib/hbnetio/utils/netiosrv.prg b/harbour/contrib/hbnetio/utils/netiosrv.prg
index 518472b300..0a0a097cac 100644
--- a/harbour/contrib/hbnetio/utils/netiosrv.prg
+++ b/harbour/contrib/hbnetio/utils/netiosrv.prg
@@ -139,7 +139,7 @@ PROCEDURE Main( ... )
                                          {|| ShowConfig( netiosrv ) } )  /* codeblock to display config both uses local vars */
 
       /* Command prompt */
-      DO WHILE !lQuit
+      DO WHILE ! lQuit
 
          cCommand := Space( 128 )
 
@@ -195,7 +195,7 @@ PROCEDURE Main( ... )
          ENDIF
          nHistIndex := Len( aHistory ) + 1
 
-         nPos := iif( Empty(cCommand), 0, hb_HPos( hCommands, Lower( cCommand ) ) )
+         nPos := iif( Empty( cCommand ), 0, hb_HPos( hCommands, Lower( cCommand ) ) )
          IF nPos > 0
             aCmd := hb_HValueAt( hCommands, nPos )
             Eval( aCmd[ 2 ], cCommand, netiosrv )
@@ -216,17 +216,16 @@ PROCEDURE Main( ... )
 /* Complete the command line, based on the first characters that the user typed. [vailtom] */
 STATIC PROCEDURE CompleteCmd( cCommand, hCommands )
    LOCAL s := Lower( AllTrim( cCommand ) )
-   LOCAL n, c
+   LOCAL n
 
    /* We need at least one character to search */
    IF Len( s ) > 1
-      FOR n := 1 TO Len( hCommands )
-          c := hb_hKeyAt( hCommands, n )
-          IF s == Lower( Left( c, Len( s ) ) )
-             cCommand := PadR( c, Len( cCommand ) )
-             ManageCursor( cCommand )
-             RETURN
-          ENDIF
+      FOR EACH n IN hCommands
+         IF s == Lower( Left( n:__enumKey(), Len( s ) ) )
+            cCommand := PadR( n:__enumKey(), Len( cCommand ) )
+            ManageCursor( cCommand )
+            RETURN
+         ENDIF
       NEXT
    ENDIF
    RETURN