Clean up parse.py