Did some refactoring in dataParser.