Cleaned up token and session id generation in preperation for userids.