Some basic refactoring
Further refactoring of the parser to bring closer to CSV Schema 1.0 Spec