Better formatting for exporter