DOC: partial refactor to use expansive