Sounds good. I'll make those changes in a separate PR.