Formatting cleanup

Just ran some auto-format on everything. Sorry for the big-ass diff.