Refactor Pending