Added ParseData to the parser
main*.cpp cleanup