Various updates, cleanup

Earlier this year I made a few simple cleanups to the code but never bothered to make a pull request. They should merge fine with the google analytics stuff I think.
Yup, I know. Since these changes are so small, I'll update the pull request soon.