Code optimizations II