put methods on their on files
Added dataFormat