Fix errors caused by blank values in CSV file
Modify regex for readability