OpenPGP: Make code neater