Code clean up, reversed to standard pf implementation