Split out firewalls
Some code cleanup