Fix trailing comma
More commas & spaces fixes