Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: Henry Schreiner <eb9c702a5237976b7b997483496bc5260300736e@gmail.com>
karies/root,olifre/root,karies/root,root-mirror/root,olifre/root,root-mirror/root,olifre/root,karies/root,olifre/root,olifre/root,root-mirror/root,root-mirror/root,olifre/root,karies/root,root-mirror/root,root-mirror/root,karies/root,root-mirror/root,olifre/root,olifre/root,root-mirror/root,karies/root,root-mirror/root,root-mirror/root,root-mirror/root,karies/root,olifre/root,karies/root,karies/root,olifre/root,olifre/root,karies/root,karies/root