Address review comments.
Cleanup documentation.
Cleanup