some improvements.

Thanks, I will be change it again as original.