Docs + simplifications