refactor users
refactor