Clean up and add benchmarks