Minor refactor benchmarks