Remove trailing whitespace and fix whitespace for commas