Refactor benchmarks 2

@jpihl take a look