See PR feedback here:
There doesn't appear to be test coverage for the first 2 methods. So I didn't want to make the suggested code changes without test coverage.
We should ensure this library has adequate test coverage and make the suggested code changes.