Good points both, I'll update the PR