code review changes @coryvirok
merge