refactor Users