refactor usersMap to users