Issue #34: Cleanup and document