code review changes @coryvirok