Formatting cleanups