Home GnuPG

Minor refactor