Improve coding style

- Remove redundant trailing commas.
- Fix indents.