Global simplifications
Docs additions