CLN: clean up data.py
Merge pull request #4002 from cpcloud/data-dot-py-cleanup

CLN: clean up data.py