Addressed PR review comments.