Clean-up and comments to Pd patch