Code revision from coding style point of view