refactor of users