diff --git a/src/www/firewall_nat_1to1_edit.php b/src/www/firewall_nat_1to1_edit.php
index e082f632f..337f70726 100644
--- a/src/www/firewall_nat_1to1_edit.php
+++ b/src/www/firewall_nat_1to1_edit.php
@@ -53,25 +53,30 @@ function formNetworks() {
 function formInterfaces() {
     global $config;
     $interfaces = array();
-    foreach ( get_configured_interface_with_descr(false, true) as $if => $ifdesc)
+    foreach ( get_configured_interface_with_descr(false, true) as $if => $ifdesc) {
         $interfaces[$if] = $ifdesc;
+    }
 
-    if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server")
+    if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server") {
         $interfaces['l2tp'] = "L2TP VPN";
+    }
 
-    if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server")
+    if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server") {
         $interfaces['pptp'] = "PPTP VPN";
+    }
 
-    if (is_pppoe_server_enabled())
+    if (is_pppoe_server_enabled()) {
         $interfaces['pppoe'] = "PPPoE VPN";
+    }
 
     /* add ipsec interfaces */
-    if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
+    if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) {
         $interfaces["enc0"] = "IPsec";
+    }
 
     /* add openvpn/tun interfaces */
     if (isset($config['openvpn']['openvpn-server']) || isset($config['openvpn']['openvpn-client'])) {
-      $interfaces['openvpn'] = 'OpenVPN';
+        $interfaces['openvpn'] = 'OpenVPN';
     }
     return $interfaces;
 }
diff --git a/src/www/firewall_nat_npt_edit.php b/src/www/firewall_nat_npt_edit.php
index 6e7a2fb24..03e0f3cad 100644
--- a/src/www/firewall_nat_npt_edit.php
+++ b/src/www/firewall_nat_npt_edit.php
@@ -37,21 +37,26 @@ require_once("pfsense-utils.inc");
 function formInterfaces() {
     global $config;
     $interfaces = array();
-    foreach ( get_configured_interface_with_descr(false, true) as $if => $ifdesc)
+    foreach ( get_configured_interface_with_descr(false, true) as $if => $ifdesc) {
         $interfaces[$if] = $ifdesc;
+    }
 
-    if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server")
+    if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server") {
         $interfaces['l2tp'] = "L2TP VPN";
+    }
 
-    if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server")
+    if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server") {
         $interfaces['pptp'] = "PPTP VPN";
+    }
 
-    if (is_pppoe_server_enabled())
+    if (is_pppoe_server_enabled()) {
         $interfaces['pppoe'] = "PPPoE VPN";
+    }
 
     /* add ipsec interfaces */
-    if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
+    if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) {
         $interfaces["enc0"] = "IPsec";
+    }
 
     /* add openvpn/tun interfaces */
     if (isset($config['openvpn']['openvpn-server']) || isset($config['openvpn']['openvpn-client'])) {
diff --git a/src/www/firewall_nat_out_edit.php b/src/www/firewall_nat_out_edit.php
index de4df9fbd..2817c60c2 100644
--- a/src/www/firewall_nat_out_edit.php
+++ b/src/www/firewall_nat_out_edit.php
@@ -38,21 +38,26 @@ require_once("pfsense-utils.inc");
 function formInterfaces() {
     global $config;
     $interfaces = array();
-    foreach ( get_configured_interface_with_descr(false, true) as $if => $ifdesc)
+    foreach ( get_configured_interface_with_descr(false, true) as $if => $ifdesc) {
         $interfaces[$if] = $ifdesc;
+    }
 
-    if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server")
+    if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server") {
         $interfaces['l2tp'] = "L2TP VPN";
+    }
 
-    if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server")
+    if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server") {
         $interfaces['pptp'] = "PPTP VPN";
+    }
 
-    if (is_pppoe_server_enabled())
-      $interfaces['pppoe'] = "PPPoE VPN";
+    if (is_pppoe_server_enabled()) {
+        $interfaces['pppoe'] = "PPPoE VPN";
+    }
 
     /* add ipsec interfaces */
-    if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
+    if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) {
         $interfaces["enc0"] = "IPsec";
+    }
 
     /* add openvpn/tun interfaces */
     if (isset($config['openvpn']['openvpn-server']) || isset($config['openvpn']['openvpn-client'])) {