Simplification pass
Added CSV output for each calculator.