Refactoring user list