address review comments from @rhelmer