A bunch of formatting cleanups.