Your firewall lacks some basic features that I expect in a firewall. Could some of these be added?
  1. Named IP address / alias - use a name for an IP address or a group of addresses instead of just the address. This would let me know at a glance who/what is allowed in a firewall.
  2. IP groups - define a group of IP addresses that can be referenced in multiple firewalls. Members of a group could be IP address, an alias/name, or another group.