Tidy up benchmark.cpp