[Checkstyle] Fix some Checkstyle errors (2)