[PD] tidy up short-cut