document, and simplify a bit more