Good point. I can make those changes as part of this pull request itself.