Yes. I'll look into that as a separate commit, after addressing these other review actions.

Thinking about this, it would justify the use of a class here.
As it currently stands there is no justification for anything other than a function!