refactor users class