Refactoring OpenPGP stuff