Clean up

Prepare for O(n log n) version
Clean up
Fix indentation
Revert "Clean up"

This reverts commit 63e5c46c1f1abd9d787491866b471ea049abc6e7.
Update benchmark script
Misc clean up
Add revision benchmark

For comparing git revisions
More clean up and fix mix bug