Simplified reading csv files
Clean up