[PATCH 3/3] Fix some coding style issues