Format cleanups