Yes, also i would like we were able to run tests for those functions, current code makes it hard.
Rework can occur after your PR is merged though.