Cleaned up output for diagnostics