Made a few tiny changes to the code so that it's more consistent, now that I have a slightly fresher set of eyes to look at it with.