csv: refactoring csv-calc...