Refactor pf ruleset