I have a few PRs of my own to tidy up, but will try and take a look at changing a bit of stuff in here for you to look at if you want.