diff --git a/firewall/apply.cgi b/firewall/apply.cgi
index 3a7b88668..98273c0f8 100755
--- a/firewall/apply.cgi
+++ b/firewall/apply.cgi
@@ -4,8 +4,12 @@
 
 require './firewall-lib.pl';
 &ReadParse();
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 $access{'apply'} || &error($text{'apply_ecannot'});
 &error_setup($text{'apply_err'});
 $err = &apply_configuration();
diff --git a/firewall/bootup.cgi b/firewall/bootup.cgi
index 0e4e34786..735029e4d 100755
--- a/firewall/bootup.cgi
+++ b/firewall/bootup.cgi
@@ -4,8 +4,12 @@
 
 require './firewall-lib.pl';
 &ReadParse();
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 $access{'bootup'} || &error($text{'bootup_ecannot'});
 if ($in{'boot'}) {
 	&create_firewall_init();
diff --git a/firewall/cluster.cgi b/firewall/cluster.cgi
index f924fdc7b..6dc8b9cf6 100755
--- a/firewall/cluster.cgi
+++ b/firewall/cluster.cgi
@@ -3,8 +3,12 @@
 
 require './firewall-lib.pl';
 &ReadParse();
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 $access{'cluster'} || &error($text{'ecluster'});
 &foreign_require("servers", "servers-lib.pl");
 &ui_print_header($text{"index_title_v${ipvx}"}, $text{'cluster_title'}, undef, "cluster");
diff --git a/firewall/cluster_add.cgi b/firewall/cluster_add.cgi
index d22d8c728..7d2434612 100755
--- a/firewall/cluster_add.cgi
+++ b/firewall/cluster_add.cgi
@@ -3,8 +3,12 @@
 
 require './firewall-lib.pl';
 &ReadParse();
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 $access{'cluster'} || &error($text{'ecluster'});
 &foreign_require("servers", "servers-lib.pl");
 @allservers = grep { $_->{'user'} } &servers::list_servers();
diff --git a/firewall/cluster_delete.cgi b/firewall/cluster_delete.cgi
index 3c9f56cb7..e2b8d6023 100755
--- a/firewall/cluster_delete.cgi
+++ b/firewall/cluster_delete.cgi
@@ -4,8 +4,12 @@
 
 require './firewall-lib.pl';
 &ReadParse();
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 $access{'cluster'} || &error($text{'ecluster'});
 &foreign_require("servers", "servers-lib.pl");
 @servers = &list_cluster_servers();
diff --git a/firewall/convert.cgi b/firewall/convert.cgi
index 9c1dda748..b04080314 100755
--- a/firewall/convert.cgi
+++ b/firewall/convert.cgi
@@ -4,8 +4,12 @@
 
 require './firewall-lib.pl';
 &ReadParse();
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 $access{'setup'} || &error($text{'setup_ecannot'});
 &error_setup($text{'convert_err'});
 &lock_file($ipvx_save);
diff --git a/firewall/edit_rule.cgi b/firewall/edit_rule.cgi
index 9b108be05..a9aadb56d 100755
--- a/firewall/edit_rule.cgi
+++ b/firewall/edit_rule.cgi
@@ -4,8 +4,12 @@
 
 require './firewall-lib.pl';
 &ReadParse();
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 @tables = &get_iptables_save();
 $table = $tables[$in{'table'}];
 &can_edit_table($table->{'name'}) || &error($text{'etable'});
diff --git a/firewall/move.cgi b/firewall/move.cgi
index 3116343cb..9a613143d 100755
--- a/firewall/move.cgi
+++ b/firewall/move.cgi
@@ -5,8 +5,12 @@
 require './firewall-lib.pl';
 &ReadParse();
 # what version IP protocaol version to use?
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 &lock_file($ipvx_save);
 @tables = &get_iptables_save();
 $table = $tables[$in{'table'}];
diff --git a/firewall/newchain.cgi b/firewall/newchain.cgi
index ffaa038b1..0eb5b83a7 100755
--- a/firewall/newchain.cgi
+++ b/firewall/newchain.cgi
@@ -4,9 +4,12 @@
 
 require './firewall-lib.pl';
 &ReadParse();
-# what version IP protocaol version to use?
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 $access{'newchain'} || &error($text{'new_ecannot'});
 @tables = &get_iptables_save();
 $table = $tables[$in{'table'}];
diff --git a/firewall/save_policy.cgi b/firewall/save_policy.cgi
index 59a864789..e503e28a5 100755
--- a/firewall/save_policy.cgi
+++ b/firewall/save_policy.cgi
@@ -4,9 +4,12 @@
 
 require './firewall-lib.pl';
 &ReadParse();
-# what version IP protocaol version to use?
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 @tables = &get_iptables_save();
 $table = $tables[$in{'table'}];
 &can_edit_table($table->{'name'}) || &error($text{'etable'});
diff --git a/firewall/save_rule.cgi b/firewall/save_rule.cgi
index 7b5308024..a51fb94ed 100755
--- a/firewall/save_rule.cgi
+++ b/firewall/save_rule.cgi
@@ -4,8 +4,12 @@
 
 require './firewall-lib.pl';
 &ReadParse();
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 &error_setup($text{'save_err'});
 @tables = &get_iptables_save();
 $table = $tables[$in{'table'}];
diff --git a/firewall/save_rule6.cgi b/firewall/save_rule6.cgi
index 6ff1cf5e9..6b85faf66 100755
--- a/firewall/save_rule6.cgi
+++ b/firewall/save_rule6.cgi
@@ -4,8 +4,12 @@
 
 require './firewall-lib.pl';
 &ReadParse();
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 &error_setup($text{'save_err'});
 @tables = &get_iptables_save();
 $table = $tables[$in{'table'}];
diff --git a/firewall/setup.cgi b/firewall/setup.cgi
index e0e9d0c7a..0d65f6edf 100755
--- a/firewall/setup.cgi
+++ b/firewall/setup.cgi
@@ -4,9 +4,12 @@
 
 require './firewall-lib.pl';
 &ReadParse();
-# what version IP protocaol version to use?
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 $access{'setup'} || &error($text{'setup_ecannot'});
 
 &lock_file($ipvx_save);
diff --git a/firewall/unapply.cgi b/firewall/unapply.cgi
index a093ccec4..e924bf786 100755
--- a/firewall/unapply.cgi
+++ b/firewall/unapply.cgi
@@ -4,9 +4,12 @@
 
 require './firewall-lib.pl';
 &ReadParse();
-# what version IP protocaol version to use?
-if (&get_ipvx_version() == 6) { require './firewall6-lib.pl';
-	} else { require './firewall4-lib.pl'; }
+if (&get_ipvx_version() == 6) {
+	require './firewall6-lib.pl';
+	}
+else {
+	require './firewall4-lib.pl';
+	}
 $access{'unapply'} || &error($text{'unapply_ecannot'});
 &error_setup($text{'apply_err'});
 if (defined(&unapply_iptables)) {