Make ps_token() more generally available and use it to improve the formatting