Cleanup and doc. Fixes #1