Fix checkstyle warnings
Optimize pom
Fix checkstyle warnings