sprint 25 updates
code review
revise per @njx
Merge pull request #47 from adobe/jasonsanjose/sprint25

sprint 25 updates