Tweak code style
Merge pull request #523 from jsw0528/patch-1

Tweak code style