diff --git a/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/ConvLib.c b/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/ConvLib.c
index 56df30c9fd..fac1fb7b58 100644
--- a/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/ConvLib.c
+++ b/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/ConvLib.c
@@ -1,4 +1,4 @@
-/**@file
+/** @file
   Common filling functions used in translating Datahub's record
   to PI SMBIOS's record.
   
@@ -105,7 +105,7 @@ SmbiosFldCacheType10 (
   @param StructureNode The structure node whose structure buffer is to be enlarged.
   @param NewLength     The new length of SMBIOS record which does not include unformat area.
   @param OldBufferSize The old size of SMBIOS record buffer.
-  @param NewSize       The new size is targeted for enlarged.
+  @param NewBufferSize The new size is targeted for enlarged.
   
   @retval EFI_OUT_OF_RESOURCES  No more memory to allocate new record
   @retval EFI_SUCCESS           Success to enlarge the record buffer size.
@@ -437,7 +437,7 @@ SmbiosFldInterLink (
     // Hang this in the link data fixup node
     //
     LinkDataFixupNode = AllocateZeroPool (sizeof (SMBIOS_LINK_DATA_FIXUP_NODE));
-    if (!LinkDataFixupNode) {
+    if (LinkDataFixupNode == NULL) {
       return EFI_OUT_OF_RESOURCES;
     }
 
diff --git a/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/MemoryConv.c b/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/MemoryConv.c
index 20cd71a42e..9200738ee3 100644
--- a/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/MemoryConv.c
+++ b/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/MemoryConv.c
@@ -331,7 +331,7 @@ SmbiosFldMemoryType3 (
   }
 
   MemoryDeviceSize = MemoryDeviceSize & 0x7fff;
-  if (MemoryDeviceSize != 0 && MemoryDeviceSizeUnitMega == FALSE) {
+  if (MemoryDeviceSize != 0 && !MemoryDeviceSizeUnitMega) {
     MemoryDeviceSize |= 0x8000;
   }
 
diff --git a/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/Thunk.h b/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/Thunk.h
index cb375b01ee..2069fa962a 100644
--- a/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/Thunk.h
+++ b/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/Thunk.h
@@ -253,7 +253,7 @@ SmbiosGetTypeMinimalLength (
   @param StructureNode The structure node whose structure buffer is to be enlarged.
   @param NewLength     The new length of SMBIOS record which does not include unformat area.
   @param OldBufferSize The old size of SMBIOS record buffer.
-  @param NewSize       The new size is targeted for enlarged.
+  @param NewBufferSize The new size is targeted for enlarged.
   
   @retval EFI_OUT_OF_RESOURCES  No more memory to allocate new record
   @retval EFI_SUCCESS           Success to enlarge the record buffer size.
diff --git a/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/Translate.c b/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/Translate.c
index 9912db8f23..3230d96576 100644
--- a/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/Translate.c
+++ b/EdkCompatibilityPkg/Compatibility/DataHubSmBiosRecordsOnPiSmBiosThunk/Translate.c
@@ -1,4 +1,4 @@
-/**@file
+/** @file
   Translate the DataHub records via EFI_DATA_HUB_PROTOCOL to Smbios recorders 
   via EFI_SMBIOS_PROTOCOL.
   
@@ -168,7 +168,7 @@ SmbiosProcessDataRecord (
       //
       StructureNode = AllocateZeroPool (sizeof (SMBIOS_STRUCTURE_NODE));
 
-      if (!StructureNode) {
+      if (StructureNode == NULL) {
         goto Done;
       }
 
@@ -268,7 +268,7 @@ SmbiosProcessDataRecord (
       // record data needs to be transformed to be filled into the field,
       // so let the FieldFillingFunction do it.
       //
-      if (!(Conversion->FieldFillingFunction)) {
+      if (Conversion->FieldFillingFunction == NULL) {
         //
         // Invalid Conversion Table Entry
         //
@@ -297,7 +297,7 @@ SmbiosProcessDataRecord (
       // Both field offset and field content are determined by
       // FieldFillingFunction
       //
-      if (!(Conversion->FieldFillingFunction)) {
+      if (Conversion->FieldFillingFunction == NULL) {
         //
         // Invalid Conversion Table Entry
         //
@@ -327,7 +327,7 @@ SmbiosProcessDataRecord (
       // FieldFillingFunction and the function accepts the whole data record
       // including the data header
       //
-      if (!(Conversion->FieldFillingFunction)) {
+      if (Conversion->FieldFillingFunction == NULL) {
         //
         // Invalid Conversion Table Entry
         //