SI-8134 Address pull request feedback

Aesthetics only.