More refactoring and quoting everything in the csv so Excel doesn't reformat columns (issue #10)