Clean up a little bit
Use correct key type in nonce map