formatting cleanups