Tidy up the benchmark utility