Cleanup.

- Formatted.
- Minor changes.