minor cleanup of the benchmarks
Simplify down some code