fix review comments.