Format fixes and cleanups.