Fix some coding style problem