next review round

Change-Id: I2906648a57bda9138be5047cc8ec2eda48450ee2
Merge pull request #38 from awong-dev/comments

next review round