Incorporating changes suggested during pull request review. Co-authored-by: Daniel Shields <[email protected]>