Reorganization of data output code
removed superfluous argp include