refactor users list