I agree. But it is not intention to change this code. I am just moving it to easier future improvements and reduce redundancy.