Simplify things
Documentation improvements