That's a good point, some of this is purely stylistic and could be separated out.  I can extract those changes and resubmit in another pull request.