Hi ypu, 

Thanks for your advice.

I have updated the code which could save one line, could you review it again?

Thanks