reorganized helpers.py a little