refactor users