Addressed code review comments

[endlessm/eos-shell#4213]