Some refactoring to the benchmark runner handlers