Code optimizations and modifications
Code optimizations and modifications