A few tweaks

Nothing major, just a few things I noticed that were easy to neaten up. Use as little or as much of it as you like.