Performance Optimizations

Reduced execute time by almost half