TST: more data.py cleanup