Benchmark refactoring