clean up and improve benchmarks