Pom cleanup and checkstyle