Docs and simplifications