Improve coding style
Merge pull request #380 from RickyChien/improve-coding-style

Improve coding style
merge