further output cleanups