closed #2522: Fix some coding style.