Fix some coding style
Merge