Yes, happy to do that in a separate PR. This was mostly a refactor of what was there already.