Output format cleanup, OIDs in separate file
Correcting usage