Little cleanup of parse.py