ENH: variable definition/organization again