Cleanup

Some docs and code cleanup.