Formatting cleanups only