Tidy up #866

[dc-mak]

          Thanks for the extra documentation comments in the code! And for doing this fiddly piece of work, and getting this merged in. If you are able to address the comments in follow-up PRs, that would be much appreciated!

Also if the commit messages in the future could follow the guidelines stated here, that would be great too: https://cbea.ms/git-commit/#seven-rules

Specifically, 50 chars for the header and a short explanation.

Originally posted by @dc-mak in #866 (review)

[yav]

Thanks for the review. I'll post my thoughts on the suggested changes in the review.