fix extra whitespace before comma, fix formatting for quoted strings