[Checkstyle] Fix some Checkstyle errors (3)