general output cleanup for consistency