Formatting cleanups.