issue #2771: fix some code style