Trivial code style fixes

Mainly to sync mine and official repo.

No functional change.