Thanks for review and suggestions!

I have fixed the issues you reported.