Protect user's API keys from other users, tidy up.