Updating a bit of logic to avoid unneeded commas