ado-fix-review-comments

Fix PR review comments, simplify code, and self-review