Content revisions from code review
[endlessm/eos-shell#3910]