DOC: refactor to use expansive