Incorporate code review comments from @drewpca
Thanks Drew!