Refactored CSV parsing.