Cleanup.
More cleanup.
More documentation.