diff --git a/SignedCapsulePkg/Include/Library/PlatformFlashAccessLib.h b/SignedCapsulePkg/Include/Library/PlatformFlashAccessLib.h
index 2eca4da78d..ea269ea23f 100644
--- a/SignedCapsulePkg/Include/Library/PlatformFlashAccessLib.h
+++ b/SignedCapsulePkg/Include/Library/PlatformFlashAccessLib.h
@@ -88,7 +88,7 @@ PerformFlashWriteWithProgress (
   IN FLASH_ADDRESS_TYPE                             FlashAddressType,
   IN VOID                                           *Buffer,
   IN UINTN                                          Length,
-  IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS  Progress,        OPTIONAL
+  IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS  Progress         OPTIONAL,
   IN UINTN                                          StartPercentage,
   IN UINTN                                          EndPercentage
   );
diff --git a/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c b/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c
index 5b7c329777..0f1444ba06 100644
--- a/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c
+++ b/SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.c
@@ -661,7 +661,7 @@ CapsuleAuthenticateSystemFirmware (
 VOID
 EFIAPI
 EdkiiSystemCapsuleLibPcdCallBack (
-  IN        CONST GUID        *CallBackGuid, OPTIONAL
+  IN        CONST GUID        *CallBackGuid  OPTIONAL,
   IN        UINTN             CallBackToken,
   IN  OUT   VOID              *TokenData,
   IN        UINTN             TokenDataSize
diff --git a/SignedCapsulePkg/Library/PlatformFlashAccessLibNull/PlatformFlashAccessLibNull.c b/SignedCapsulePkg/Library/PlatformFlashAccessLibNull/PlatformFlashAccessLibNull.c
index d9efe6dcbd..fd89a5218c 100644
--- a/SignedCapsulePkg/Library/PlatformFlashAccessLibNull/PlatformFlashAccessLibNull.c
+++ b/SignedCapsulePkg/Library/PlatformFlashAccessLibNull/PlatformFlashAccessLibNull.c
@@ -51,7 +51,7 @@ PerformFlashWriteWithProgress (
   IN FLASH_ADDRESS_TYPE                             FlashAddressType,
   IN VOID                                           *Buffer,
   IN UINTN                                          Length,
-  IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS  Progress,        OPTIONAL
+  IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS  Progress         OPTIONAL,
   IN UINTN                                          StartPercentage,
   IN UINTN                                          EndPercentage
   )
@@ -98,4 +98,3 @@ PerformFlashWrite (
            0
            );
 }
-
diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
index af8e5cb84c..d275ef654c 100644
--- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
+++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c
@@ -241,7 +241,7 @@ IsValidCapsuleHeader (
 EFI_STATUS
 ValidateFmpCapsule (
   IN EFI_CAPSULE_HEADER *CapsuleHeader,
-  OUT BOOLEAN           *IsSystemFmp, OPTIONAL
+  OUT BOOLEAN           *IsSystemFmp  OPTIONAL,
   OUT UINT16            *EmbeddedDriverCount OPTIONAL
   )
 {