Light refactoring of signer