discover.py: break up