(refactor) Removed a lot of excess trailing commas.