Simplifying and updating docs