Minor cleanup in PFD