agree and should be done in a separate PR. i will put this onto my todo list.