clean up and add missing util.py