whitespace cleanup
make dynamic subclass names not clash with function names in heurisch_diff.py