diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
index d278ee60e6..e6884a2d59 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c
@@ -324,14 +324,10 @@ BcfgAddDebug1(
       }
     }
   }
-  if (FileNode != NULL) {
-    FreePool (FileNode);
-  }
 
 //
 //If always Free FilePath, will free devicepath in system when use "addh"
 //
-
   if (FilePath!=NULL && !UseHandle) {
     FreePool (FilePath);
   }
@@ -467,6 +463,14 @@ BcfgMoveDebug1(
   return (SHELL_SUCCESS);
 }
 
+/**
+  Function to add optional data to an option.
+
+  @param[in] OptData      The optional data to add.
+  @param[in] Target       The target of the operation.
+
+  @retval SHELL_SUCCESS   The operation was succesful.
+**/
 SHELL_STATUS
 EFIAPI
 BcfgAddOptDebug1(
diff --git a/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c b/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
index ec03df1d60..aeb3fcd10e 100644
--- a/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
+++ b/ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c
@@ -324,14 +324,10 @@ BcfgAddInstall1(
       }
     }
   }
-  if (FileNode != NULL) {
-    FreePool (FileNode);
-  }
 
 //
 //If always Free FilePath, will free devicepath in system when use "addh"
 //
-
   if (FilePath!=NULL && !UseHandle) {
     FreePool (FilePath);
   }
@@ -467,6 +463,14 @@ BcfgMoveInstall1(
   return (SHELL_SUCCESS);
 }
 
+/**
+  Function to add optional data to an option.
+
+  @param[in] OptData      The optional data to add.
+  @param[in] Target       The target of the operation.
+
+  @retval SHELL_SUCCESS   The operation was succesful.
+**/
 SHELL_STATUS
 EFIAPI
 BcfgAddOptInstall1(