correct indentation
remove code duplication
pump target picker should only be used when target to be chosen are permanents
replace repeated PN with 'his or her'