Minor refactor, added gpg-agent