Added the data file and refactored the CSV file parsing code