Improve output format, to be more suitable for excel import