Fix multi-spaces and commas