There were a lot of coding style issues with this file, but I think I've reduced the number down to mainly line length and CamelCase issues. I've put it in 13 patches to, hopefully, make it easier to review, and see that I've made no changes to functionality of the code, (I hope).
John
