DOC: partial refactor to use expansive
DOC: more doc work