Read PGP data better, modularize a bit.