code and test clean up + updated benchmark results