DOC: refactor for expansive - phase 1
DOC: refactor for expansive - phase 2
DOC: refactor to use expansive