diff --git a/NetworkPkg/DnsDxe/DnsDhcp.c b/NetworkPkg/DnsDxe/DnsDhcp.c
index 9ea9d7c8f6..8f8b2aab1e 100644
--- a/NetworkPkg/DnsDxe/DnsDhcp.c
+++ b/NetworkPkg/DnsDxe/DnsDhcp.c
@@ -131,7 +131,7 @@ ParseDhcp4Ack (
         return EFI_OUT_OF_RESOURCES;
       }
 
-      for(Count=0; Count < ServerCount; Count++){
+      for (Count=0; Count < ServerCount; Count++) {
         CopyMem (ServerList + Count, &OptionList[Index]->Data[4 * Count], sizeof (EFI_IPv4_ADDRESS));
       }
 
@@ -225,7 +225,7 @@ ParseDhcp6Ack (
         return EFI_OUT_OF_RESOURCES;
       }
 
-      for(Count=0; Count < ServerCount; Count++){
+      for (Count=0; Count < ServerCount; Count++) {
         CopyMem (ServerList + Count, &OptionList[Index]->Data[16 * Count], sizeof (EFI_IPv6_ADDRESS));
       }
 
diff --git a/NetworkPkg/DnsDxe/DnsDriver.c b/NetworkPkg/DnsDxe/DnsDriver.c
index f099da8a5a..4db0c6bdd1 100644
--- a/NetworkPkg/DnsDxe/DnsDriver.c
+++ b/NetworkPkg/DnsDxe/DnsDriver.c
@@ -197,11 +197,11 @@ DnsDestroyService (
 {
   UdpIoFreeIo (DnsSb->ConnectUdp);
 
-  if (DnsSb->TimerToGetMap != NULL){
+  if (DnsSb->TimerToGetMap != NULL) {
     gBS->CloseEvent (DnsSb->TimerToGetMap);
   }
 
-  if (DnsSb->Timer != NULL){
+  if (DnsSb->Timer != NULL) {
     gBS->CloseEvent (DnsSb->Timer);
   }
 
diff --git a/NetworkPkg/DnsDxe/DnsImpl.c b/NetworkPkg/DnsDxe/DnsImpl.c
index 25628a5704..2edcb280ac 100644
--- a/NetworkPkg/DnsDxe/DnsImpl.c
+++ b/NetworkPkg/DnsDxe/DnsImpl.c
@@ -799,7 +799,7 @@ UpdateDns4Cache (
         Item->DnsCache.Timeout = DnsCacheEntry.Timeout;
 
         return EFI_SUCCESS;
-      }else {
+      } else {
         return EFI_ACCESS_DENIED;
       }
     }
@@ -897,7 +897,7 @@ UpdateDns6Cache (
         Item->DnsCache.Timeout = DnsCacheEntry.Timeout;
 
         return EFI_SUCCESS;
-      }else {
+      } else {
         return EFI_ACCESS_DENIED;
       }
     }
@@ -1080,7 +1080,7 @@ IsValidDnsResponse (
   NET_LIST_FOR_EACH (Entry, &TokensMap->Used) {
     *Item = NET_LIST_USER_STRUCT (Entry, NET_MAP_ITEM, Link);
     Packet = (NET_BUF *) ((*Item)->Value);
-    if (Packet == NULL){
+    if (Packet == NULL) {
 
       continue;
     } else {
@@ -2127,7 +2127,7 @@ DnsOnTimerRetransmit (
         }
       }
     }
-  }else {
+  } else {
     //
     // Iterate through all the children of the DNS service instance. Time
     // out the packet. If maximum retries reached, clean the Token up.
diff --git a/NetworkPkg/DnsDxe/DnsImpl.h b/NetworkPkg/DnsDxe/DnsImpl.h
index 10bc399e9e..affbb4be8d 100644
--- a/NetworkPkg/DnsDxe/DnsImpl.h
+++ b/NetworkPkg/DnsDxe/DnsImpl.h
@@ -125,7 +125,7 @@ typedef struct {
   EFI_DNS6_COMPLETION_TOKEN  *Token;
 } DNS6_TOKEN_ENTRY;
 
-union _DNS_FLAGS{
+union _DNS_FLAGS {
   struct {
     UINT16     RCode:4;
     UINT16     Zero:3;
diff --git a/NetworkPkg/DnsDxe/DnsProtocol.c b/NetworkPkg/DnsDxe/DnsProtocol.c
index 4acc5fca46..a0bb58ef1d 100644
--- a/NetworkPkg/DnsDxe/DnsProtocol.c
+++ b/NetworkPkg/DnsDxe/DnsProtocol.c
@@ -217,7 +217,7 @@ Dns4Configure (
       Dns4InstanceCancelToken(Instance, NULL);
     }
 
-    if (Instance->UdpIo != NULL){
+    if (Instance->UdpIo != NULL) {
       UdpIoCleanIo (Instance->UdpIo);
     }
 
@@ -1061,7 +1061,7 @@ Dns6Configure (
       Dns6InstanceCancelToken(Instance, NULL);
     }
 
-    if (Instance->UdpIo != NULL){
+    if (Instance->UdpIo != NULL) {
       UdpIoCleanIo (Instance->UdpIo);
     }