Tidying up

I'm just going to merge this myself, like an egomaniac, but creating a PR for posterity.