Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Lawrence Murray <7c475edc68ebd3a158bd6739aa984eede25ca5fc@indii.org>
lawmurray/Birch,lawmurray/Birch,lawmurray/Birch