refactor naming of token to user id
fix