Clean up CSV output
Fix CSV output for attach mode