Reindent long line
Prefer trailing comma
Restore indentation to reflect content.
Prefer the default 80 character limit.