Update and clean up benchmark.py