Fix misc style issues

Style changes are bad, but I can't help them. They really do annoy me.