Refactored for improved performance

Minor refactors and code improvements which improved the performance. Benchmarks are also updated for the latest code.