* Fixed some typo
* Some code optimization
* Fixed some typo