Issue #77 - More cleanup and documentation.