Remove unnecessary commas

And make list endings more consistent in punctuation