printf cleanups