Minor clean up and fix bug with CSV export for 0 values.