Misc style updates while Adam was boss-manning the hard shit.
Fixing merge conflicts