Various mostly pointless style edits

These are all style, so LMK if you'd like me to amend anything.