Optmized out termporary variable
Added modification credit