Refactor benchmarking

- Rename
- Remove dependencies
Refactor to use new benchmarking
Refactor to use new benchmarking
Add vectorized method (and benchmarking)