Some simple code style fixes

Getting a few easy things out of the way so they don't clutter the PRs yet to come... :)