indentation
cleanup and add fields to export