reformat, cleanup, added attachemnts by field name