diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
index eedad99f8f..e4f2645d31 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
@@ -1,7 +1,7 @@
 /** @file
-  The header file of IScsiConfig.c
+  The header file of IScsiConfig.c.
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation.<BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -10,14 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-Module Name:
-
-  IScsiConfig.h
-
-Abstract:
-
-  The header file of IScsiConfig.c
-
 **/
 
 #ifndef _ISCSI_CONFIG_H_
@@ -30,7 +22,6 @@ Abstract:
 #include <Library/DebugLib.h>
 #include <Library/BaseLib.h>
 #include <Library/NetLib.h>
-#include "IScsiConfigNVDataStruc.h"
 
 extern UINT8  IScsiConfigDxeBin[];
 extern UINT8  IScsiDxeStrings[];
@@ -90,16 +81,13 @@ typedef struct _ISCSI_FORM_CALLBACK_INFO {
   Updates the iSCSI configuration form to add/delete an entry for the iSCSI
   device specified by the Controller.
 
-  @param  DriverBindingHandle[in] The driverbinding handle.
-
-  @param  Controller[in]          The controller handle of the iSCSI device.
-
-  @param  AddForm[in]             Whether to add or delete a form entry.
+  @param[in]  DriverBindingHandle The driverbinding handle.
+  @param[in]  Controller          The controller handle of the iSCSI device.
+  @param[in]  AddForm             Whether to add or delete a form entry.
 
   @retval EFI_SUCCESS             The iSCSI configuration form is updated.
-
   @retval EFI_OUT_OF_RESOURCES    Failed to allocate memory.
-
+  @retval Others                  Some unexpected errors happened.
 **/
 EFI_STATUS
 IScsiConfigUpdateForm (
@@ -111,12 +99,11 @@ IScsiConfigUpdateForm (
 /**
   Initialize the iSCSI configuration form.
 
-  @param  DriverBindingHandle[in] The iSCSI driverbinding handle.
-
-  @retval EFI_SUCCESS             The iSCSI configuration form is initialized.
-
-  @retval EFI_OUT_OF_RESOURCES    Failed to allocate memory.
+  @param[in]  DriverBindingHandle  The iSCSI driverbinding handle.
 
+  @retval EFI_SUCCESS              The iSCSI configuration form is initialized.
+  @retval EFI_OUT_OF_RESOURCES     Failed to allocate memory.
+  @retval Others                   Some unexpected error happened.
 **/
 EFI_STATUS
 IScsiConfigFormInit (
@@ -128,12 +115,10 @@ IScsiConfigFormInit (
   device configuration entries, uninstall the form callback protocol and
   free the resources used.
 
-  @param  DriverBindingHandle[in] The iSCSI driverbinding handle.
-
+  @param[in]  DriverBindingHandle The iSCSI driverbinding handle.
+  
   @retval EFI_SUCCESS             The iSCSI configuration form is unloaded.
-
   @retval EFI_OUT_OF_RESOURCES    Failed to allocate memory.
-
 **/
 EFI_STATUS
 IScsiConfigFormUnload (