Refactor benchmarks