Cleanup, fix some utils.py syntax errors