rename accountId to userId
code refine