Added benchmarks, cleanup