Performance improvements

* 28.8% improvement in execution time.