Minor clean-ups
Refactor to modularize benchmarking
Minor updates
Refactor to add benchmarking