Generic method for adding headers to table
Refactored firewall manager
Cleanup
Refactor of firewall completed
Refactored code and fixed minor issues