Revert "tydy up pfARG code"

This reverts commit c5f14410e80a752649c24299adfddcc792d5e0a5.
Revert "Revert "tydy up pfARG code""

This reverts commit e2d6a7b61d9cf1e2dad7ff1fccc6cf92a512da7a.
Revert "Revert "Revert "tydy up pfARG code"""

This reverts commit bb03582bb72df48d19025db57b279e7f7cf0c929.