> Perhaps we could leave your suggested changes for a follow-up pull request.

Ya, that sounds fine. Keep in mind I've already done all this stuff ~2 years ago it's all old hat to me.