Docs and cleanups