CLN: Address some TODO comments
- [x] closes #23098
- [x] tests added / passed
- [x] passes `git diff upstream/master -u -- "*.py" | flake8 --diff`

I am technically moving some public (non top level) helper functions and making them private, but I don't think it warrants a depreciation.