DOC: refactor for expansive