Yes. Originally this code was doing other things, but I agree than now what you suggest is cleaner. I will change it.