Fix the coding style (part 2)