Small refactoring of Signer and Key