[FIX] CSV Parsing: attributes
[MIN] cleanups