Address review comments

TBR: missed this commit to address review comments in #3576