Fix review comments from #2299

[abrennan89]

Describe the change you'd like to see
Fix review comments from #2299

Additional context
Usually these should be fixed by the person opening a PR but in this case I am making an exception to get the content included at least.

[vmexalien]

/assign @vmexalien

[vmexalien]

actively working on this issue; still familiarizing before next steps