Tweak code style
Tweak code style