Refactor the benchmarks