Address Ben's feedback from PR #100