Happy to review any PR that does it better.