refactor pending orphan list import following code review