format cleanups