Solve Checkstyle warnings
Solve Checkstyle warnings