cleaned up names, added caliper benchmarks