Now reads all .csv files in the dir.
Minor code layout improvement.