Improve fileformat and dataformat return values. Step 1