refactor pgp config a bit