benchmark.py updates and cleanup