Solve Checkstyle warnings