Docs and cleanup