Refactor CSVParser

A lot of unnecessary code in csv parser.