I agree, I think your code is equivalent and simpler. I will change and test.