review comment changes from #90