format & cleanups