Further formatting cleanups