More formatting cleanups