remove some uninteresting comments
keyring: a little better structure