I'll do another PR for that then. There's a bunch of style fixes I want to make in a few of the files.