Remove extra commas
White-space related fixes
Add missing white-space