Addresses review feedback

Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com>